Browse Source

修复Demo在AndroidStudioCanary2020.3.1上的编译错误问题

drake 4 years ago
parent
commit
d078007323
4 changed files with 11 additions and 17 deletions
  1. 4 2
      build.gradle
  2. 3 6
      kalle/build.gradle
  3. 2 6
      net/build.gradle
  4. 2 3
      sample/build.gradle

+ 4 - 2
build.gradle

@@ -18,7 +18,7 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.4.31'
+        kotlin_version = '1.4.32'
         brv_version = '1.3.19'
         coroutine_version = '1.4.3'
         glide_version = '4.11.0'
@@ -26,6 +26,7 @@ buildscript {
     }
 
     repositories {
+        mavenCentral()
         google()
         jcenter()
     }
@@ -39,9 +40,10 @@ buildscript {
 
 allprojects {
     repositories {
+        mavenCentral()
         google()
-        jcenter()
         maven { url 'https://jitpack.io' }
+        jcenter()
     }
 }
 

+ 3 - 6
kalle/build.gradle

@@ -16,22 +16,19 @@
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.liangjingkanji'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
-
+    compileSdkVersion 30
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 28
+        targetSdkVersion 30
     }
 }
 dependencies {
-    implementation "androidx.core:core-ktx:1.3.1"
+    implementation "androidx.core:core-ktx:1.3.2"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {

+ 2 - 6
net/build.gradle

@@ -16,7 +16,6 @@
 
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
-apply plugin: "kotlin-android-extensions"
 apply plugin: "kotlin-kapt"
 apply plugin: 'org.jetbrains.dokka'
 
@@ -24,13 +23,10 @@ apply plugin: "com.github.dcendents.android-maven"
 group = "com.gitlab.liangjingkanji"
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
-
-
+    compileSdkVersion 30
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 

+ 2 - 3
sample/build.gradle

@@ -20,12 +20,11 @@ apply plugin: "kotlin-android-extensions"
 apply plugin: "kotlin-kapt"
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 30
     defaultConfig {
         applicationId "com.drake.net.sample"
         minSdkVersion 19
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         multiDexEnabled true
         versionName "1.0"