Upgrade AGP to v8.0.1

yongce · yongce · commit 1e9977d1da13 · 2023-05-09T23:40:31.000+08:00
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/android_project_common.gradle b/android_project_common.gradle
@@ -28,39 +28,38 @@ ext {
 
     versions = [
             // compile
-            'compileSdk'       : 31,
+            'compileSdk'       : 33,
 
             // Android official support
-            'kotlin'           : '1.6.10',
-            'kotlinCoroutine'  : "1.5.2",
+            'kotlin'           : '1.8.20',
+            'kotlinCoroutine'  : "1.7.0",
             'multidexLib'      : "2.0.1",
-            'androidxCore'     : '1.7.0',
-            'fragment'         : '1.4.1',
+            'androidxCore'     : '1.10.0',
+            'fragment'         : '1.5.7',
             'preference'       : "1.2.0",
             'palette'          : "1.0.0",
-            'recyclerView'     : "1.2.1",
-            'constraintLayout' : "2.1.3",
+            'recyclerView'     : "1.3.0",
+            'constraintLayout' : "2.1.4",
             'vectorDrawable'   : "1.1.0",
-            'lintLib'          : '30.0.2',
-            'archCore'         : "2.1.0",
-            'lifecycle'        : "2.4.1",
-            'room'             : '2.4.1',
-            'sqlite'           : "2.2.0",
-            'navigation'       : "2.4.1",
-            'paging'           : "3.1.0",
-            'work'             : "2.7.1",
+            'lintLib'          : '31.0.1',
+            'archCore'         : "2.2.0",
+            'lifecycle'        : "2.6.1",
+            'room'             : '2.5.1',
+            'sqlite'           : "2.3.1",
+            'navigation'       : "2.5.3",
+            'paging'           : "3.1.1",
+            'work'             : "2.8.1",
             'media2'           : "1.2.1",
 
             // test
-            'testCore'         : "1.4.0",
-            'espresso'         : "3.4.0",
+            'testCore'         : "1.5.0",
+            'espresso'         : "3.5.1",
             'uiautomator'      : "2.2.0",
-            'truth'            : '1.0.1',
+            'truth'            : '1.1.3',
             'hamcrest'         : '2.2',
-            'mockito'          : "3.5.11",
-            'powermock'        : '1.6.6',
-            'robolectric'      : '4.5.1',
-            'mockk'            : "1.10.0",
+            'mockito'          : "5.3.1",
+            'robolectric'      : '4.10.2',
+            'mockk'            : "1.13.5",
 
             // google
             'gms'              : '18.0.0',
@@ -69,32 +68,32 @@ ext {
             // infrastructure
             'butterknife'      : "10.2.3",
             'timber'           : "5.0.1",
-            'guava'            : "29.0-android",
+            'guava'            : "31.1-android",
 
             // debug
-            'leakcanary'       : "2.5",
-            'stetho'           : '1.5.1',
+            'leakcanary'       : "2.10",
+            'stetho'           : '1.6.0',
             'ktlint'           : "0.41.0",
 
             // serializing
-            'gson'             : '2.8.6',
-            'protobuf'         : "3.1.0",
+            'gson'             : '2.10.1',
+            'protobuf'         : "4.22.4",
 
             // network & image
-            'okhttp'           : '4.9.0',
+            'okhttp'           : '4.11.0',
             'retrofit'         : '2.9.0',
-            'glide'            : '4.11.0',
+            'glide'            : '4.15.1',
             'glideTrans'       : "4.3.0",
 
             // rx
-            'rxjava'           : "2.2.12",
-            'rxandroid'        : "2.1.1",
+            'rxjava3'           : "3.1.6",
+            'rxandroid3'        : "3.0.2",
 
             // ycdev
             'androidLib'       : "2.0.0",
 
             // others
-            'zxing'            : '3.4.0',
+            'zxing'            : '3.5.1',
     ]
     deps = [
             // Android official support
@@ -227,8 +226,6 @@ ext {
                     'hamcrestCore'     : "org.hamcrest:hamcrest-core:${versions.hamcrest}",
                     'hamcrestLibrary'  : "org.hamcrest:hamcrest-library:${versions.hamcrest}",
                     'mockitoCore'      : "org.mockito:mockito-core:${versions.mockito}",
-                    'powermockMockito' : "org.powermock:powermock-api-mockito:${versions.powermock}",
-                    'powermockJunit'   : "org.powermock:powermock-module-junit4:${versions.powermock}",
                     'mockk'            : "io.mockk:mockk:${versions.mockk}",
                     'mockkAndroid'     : "io.mockk:mockk-android:${versions.mockk}",
                     'robolectric'      : "org.robolectric:robolectric:${versions.robolectric}",
diff --git a/archLintRules/build.gradle b/archLintRules/build.gradle
@@ -29,6 +29,6 @@ test {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 }
diff --git a/archLintRulesTestDemo/build.gradle b/archLintRulesTestDemo/build.gradle
@@ -85,15 +85,14 @@ dependencies {
     implementation "com.facebook.stetho:stetho:${versions.stetho}"
 
     implementation "com.google.code.gson:gson:${versions.gson}"
-    implementation "com.google.protobuf.nano:protobuf-javanano:${versions.protobuf}"
 
     implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
     implementation "com.squareup.retrofit2:retrofit:${versions.retrofit}"
     implementation "com.github.bumptech.glide:glide:${versions.glide}"
     implementation "jp.wasabeef:glide-transformations:${versions.glideTrans}"
 
-    implementation "io.reactivex.rxjava2:rxjava:${versions.rxjava}"
-    implementation "io.reactivex.rxjava2:rxandroid:${versions.rxandroid}"
+    implementation "io.reactivex.rxjava3:rxjava:${versions.rxjava3}"
+    implementation "io.reactivex.rxjava3:rxandroid:${versions.rxandroid3}"
 
     implementation "com.google.zxing:core:${versions.zxing}"
     implementation "com.google.android.flexbox:flexbox:3.0.0"
@@ -105,7 +104,6 @@ dependencies {
     testImplementation "androidx.test:rules:${versions.testCore}"
     testImplementation "org.hamcrest:hamcrest-core:${versions.hamcrest}"
     testImplementation "org.mockito:mockito-core:${versions.mockito}"
-    testImplementation "org.powermock:powermock-api-mockito:${versions.powermock}"
     testImplementation "org.robolectric:robolectric:${versions.robolectric}"
     testImplementation "com.google.truth:truth:${versions.truth}"
     testImplementation "androidx.test.ext:truth:1.4.0"
diff --git a/build.gradle b/build.gradle
@@ -6,14 +6,14 @@ buildscript {
     apply from: "${androidProjectCommon}"
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
     }
 }
 
 plugins {
     id("com.diffplug.spotless") version "5.16.0"
-    id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
+    id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
 }
 
 ext {
diff --git a/gradle.properties b/gradle.properties
@@ -3,4 +3,6 @@ android.enableJetifier=true
 
 org.gradle.jvmargs=-Xmx4096M
 
-android.disableAutomaticComponentCreation=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
diff --git a/jniLib/build.gradle b/jniLib/build.gradle
@@ -18,7 +18,7 @@ android {
     ndkVersion versions.ndkVersion
     externalNativeBuild {
         cmake {
-            version "3.10.2"
+            version "3.22.1"
             path file('CMakeLists.txt')
         }
     }
diff --git a/jniLibDemo/build.gradle b/jniLibDemo/build.gradle
@@ -7,7 +7,7 @@ android {
     namespace 'me.ycdev.android.lib.commonjni.demo'
     defaultConfig {
         minSdkVersion versions.minSdk
-        targetSdkVersion 31
+        targetSdkVersion 33
 
         applicationId "me.ycdev.android.lib.commonjni.demo"
         versionCode 1

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@ test {`
`29`	`29`
`30`	`30`	`tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {`
`31`	`31`	`kotlinOptions {`
`32`		`- jvmTarget = "11"`
	`32`	`+ jvmTarget = "17"`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,14 @@ buildscript {`
`6`	`6`	`apply from: "${androidProjectCommon}"`
`7`	`7`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:7.3.1'`
	`9`	`+ classpath 'com.android.tools.build:gradle:8.0.1'`
`10`	`10`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`plugins {`
`15`	`15`	`id("com.diffplug.spotless") version "5.16.0"`
`16`		`- id("io.github.gradle-nexus.publish-plugin") version "1.1.0"`
	`16`	`+ id("io.github.gradle-nexus.publish-plugin") version "1.3.0"`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`ext {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ android {`
`18`	`18`	`ndkVersion versions.ndkVersion`
`19`	`19`	`externalNativeBuild {`
`20`	`20`	`cmake {`
`21`		`- version "3.10.2"`
	`21`	`+ version "3.22.1"`
`22`	`22`	`path file('CMakeLists.txt')`
`23`	`23`	`}`
`24`	`24`	`}`