diff --git a/app/build.gradle b/app/build.gradle index afc10dcc..394c381c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,15 @@ apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' +//apply plugin: 'kotlin-android' android { - compileSdkVersion 24 + compileSdkVersion 27 defaultConfig { applicationId "com.jacky.launcher" minSdkVersion 17 - targetSdkVersion 24 - versionCode 1 - versionName "1.0" + targetSdkVersion 27 + versionCode 21 + versionName "2.1" } signingConfigs { @@ -35,18 +35,14 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.android.support:support-v4:24.2.0' - compile "com.android.support:appcompat-v7:24.2.0" + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:support-v4:27.0.1' + implementation "com.android.support:appcompat-v7:27.0.1" + implementation 'com.android.support:leanback-v17:27.0.1' + implementation 'com.android.support:preference-leanback-v17:27.0.1' - compile 'com.android.support:leanback-v17:24.2.0' - compile 'com.android.support:preference-leanback-v17:24.2.0' + implementation 'fm.jiecao:jiecaovideoplayer:4.6.4' + implementation 'com.github.bumptech.glide:glide:3.4.+' - compile 'fm.jiecao:jiecaovideoplayer:4.6.4' - - compile 'com.android.support:recyclerview-v7:24.2.0' - compile 'com.android.support:cardview-v7:24.2.0' - compile 'com.github.bumptech.glide:glide:3.4.+' -// compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" +// implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } \ No newline at end of file diff --git a/build.gradle b/build.gradle index fd4b9829..bc4566ca 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.61' +// ext.kotlin_version = '1.3.30' repositories { google() jcenter() } dependencies { classpath 'com.android.tools.build:gradle:3.3.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" +// classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -21,4 +21,4 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file