升级gradle版本

Author: FlyJingFish

app/build.gradle

@@ -26,10 +26,10 @@ androidAopConfig {
 }
 android {
     namespace 'com.flyjingfish.androidaop'
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "com.flyjingfish.androidaop"
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
@@ -76,21 +76,13 @@ android {
 
         }
     }
-
-
     packagingOptions {
-        exclude 'META-INF/kotlinx_coroutines_core.version'
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE.txt'
-        exclude 'license/README.dom.txt'
-        exclude 'license/LICENSE.dom-documentation.txt'
-        exclude 'license/NOTICE'
-        exclude 'license/LICENSE.dom-software.txt'
-        exclude 'license/LICENSE'
+        resources {
+            excludes += ['META-INF/kotlinx_coroutines_core.version', 'META-INF/DEPENDENCIES', 'META-INF/NOTICE', 'META-INF/LICENSE', 'META-INF/LICENSE.txt', 'META-INF/NOTICE.txt', 'license/README.dom.txt', 'license/LICENSE.dom-documentation.txt', 'license/NOTICE', 'license/LICENSE.dom-software.txt', 'license/LICENSE']
+        }
     }
+
+
     dynamicFeatures = [':dynamicfeature']
 
 }

build.gradle

@@ -7,13 +7,13 @@ buildscript {
     }
 }
 plugins {
-    id 'com.android.application' version '8.2.2' apply false
-    id 'com.android.library' version '8.2.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
+    id 'com.android.application' version '9.1.1' apply false
+    id 'com.android.library' version '9.1.1' apply false
+    id 'org.jetbrains.kotlin.android' version '2.2.10' apply false
     id 'org.jetbrains.kotlin.jvm' version '1.9.23' apply false
     //https://github.com/vanniktech/gradle-maven-publish-plugin
     id "com.vanniktech.maven.publish" version "0.33.0" apply false
-    id 'com.google.devtools.ksp' version '1.9.23-1.0.20' apply false
+    id 'com.google.devtools.ksp' version '2.3.2' apply false
     id 'io.github.flyjingfish.easyregister' version '1.1.0' apply false
     id 'com.gradle.plugin-publish' version '1.2.1' apply false
     alias(libs.plugins.android.dynamic.feature) apply false
@@ -23,7 +23,7 @@ plugins {
 apply plugin: "android.aop"
 //apply plugin: "android.aop.clean"
 ext {
-    sdkVersion = 31
+    sdkVersion = 34
     minSdkVersion = 21
 }
 

gradle.properties

@@ -47,7 +47,7 @@ SonatypeTestCode = 1702
 TestType = -1
 publishGradle = 0
 
-androidAop.debugMode = true
+androidAop.debugMode = false
 androidAop.debugMode.variantOnlyDebug = true
 androidAop.reflectInvokeMethod = false
 androidAop.reflectInvokeMethod.variantOnlyDebug = false
@@ -70,4 +70,14 @@ ksp.incremental.intermodule=true
 
 mavenCentralPublishing=true
 
-signAllPublications=true
+signAllPublications=true
+android.defaults.buildfeatures.resvalues=true
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.enableAppCompileTimeRClass=false
+android.usesSdkInManifest.disallowed=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+android.builtInKotlin=false
+android.newDsl=false

gradle/android_base.gradle

@@ -3,7 +3,6 @@ android {
 
     defaultConfig {
         minSdk rootProject.ext.minSdkVersion
-        targetSdk rootProject.ext.sdkVersion
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11

gradle/libs.versions.toml

@@ -25,8 +25,8 @@ test-rules = "1.5.0"
 flyjingfish_javassist_version = "1.0.3"
 fasttransform_version = "1.0.8"
 kotlinx-metadata-jvm-version = "0.9.0"
-agp = "8.2.2"
-kotlinVersion = "1.9.23"
+agp = "9.1.1"
+kotlinVersion = "2.2.10"
 [libraries]
 kotlinpoet-ksp = { group = "com.squareup", name = "kotlinpoet-ksp", version.ref = "kotlinpoet_version" }
 kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version.ref = "kotlinpoet_version" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Aug 01 17:29:10 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

test-app/build.gradle

@@ -62,6 +62,11 @@ android {
             signingConfig signingConfigs.release
         }
     }
+    packagingOptions {
+        resources {
+            excludes += ['META-INF/kotlinx_coroutines_core.version', 'META-INF/DEPENDENCIES', 'META-INF/NOTICE', 'META-INF/LICENSE', 'META-INF/LICENSE.txt', 'META-INF/NOTICE.txt', 'license/README.dom.txt', 'license/LICENSE.dom-documentation.txt', 'license/NOTICE', 'license/LICENSE.dom-software.txt', 'license/LICENSE']
+        }
+    }
 
     buildTypes {
         debug {
@@ -81,20 +86,6 @@ android {
     }
 
 
-    packagingOptions {
-        exclude 'META-INF/kotlinx_coroutines_core.version'
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE.txt'
-        exclude 'license/README.dom.txt'
-        exclude 'license/LICENSE.dom-documentation.txt'
-        exclude 'license/NOTICE'
-        exclude 'license/LICENSE.dom-software.txt'
-        exclude 'license/LICENSE'
-    }
-
 }
 
 dependencies {

test-lib/build.gradle

@@ -9,10 +9,13 @@ apply from: "$rootDir/gradle/android_base.gradle"
 android {
     namespace 'com.flyjingfish.test_lib'
     compileSdk 33
-    defaultConfig {
+    lint {
         targetSdk 33
     }
-//    kotlin {
+    testOptions {
+        targetSdk 33
+    }
+    //    kotlin {
 //        sourceSets {
 //            // 让IDE识别KSP生成的代码
 //            main.kotlin.srcDirs += 'build/generated/ksp'