适配gradle9+

Author: FlyJingFish

android-aop-apt/src/main/java/com/flyjingfish/android_aop_ksp/AndroidAopSymbolProcessor.kt

@@ -115,7 +115,7 @@ class AndroidAopSymbolProcessor(private val codeGenerator: CodeGenerator,
         } else if (targetValue is ArrayList<*>) {
           for (s in targetValue) {
             if (symbol.origin == Origin.JAVA) {
-              if ("METHOD" != s.toString()) {
+              if (!s.toString().contains("METHOD")) {
                 if (targetValue.size > 1) {
                   throw IllegalArgumentException("注意： $symbol 只可以设置 @Target 为 METHOD 这一种")
                 } else {
@@ -161,7 +161,7 @@ class AndroidAopSymbolProcessor(private val codeGenerator: CodeGenerator,
       val retentionMap: MutableMap<String, Any?>? = annotationMap["@Retention"]
       if (retentionMap != null) {
         val retention = retentionMap["value"]?.toString()
-        if ((symbol.origin == Origin.JAVA && "RUNTIME" != retention)
+        if ((symbol.origin == Origin.JAVA && retention?.contains("RUNTIME") != true)
           || (symbol.origin == Origin.KOTLIN && retention?.contains("AnnotationRetention.RUNTIME") != true)) {
           throw IllegalArgumentException("注意：请给 $symbol 设置 @Retention 为 RUNTIME ")
         }

android-aop-core/build.gradle

@@ -1,6 +1,5 @@
 plugins {
     id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
 }
 apply from: "$rootDir/gradle/android_base.gradle"
 apply from: "$rootDir/gradle/android_publish.gradle"

android-aop-extra/build.gradle

@@ -1,6 +1,5 @@
 plugins {
     id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
     id 'com.google.devtools.ksp'
 }
 apply from: "$rootDir/gradle/android_base.gradle"
@@ -10,6 +9,7 @@ android {
 }
 
 dependencies {
+    compileOnly libs.androidx.lifecycle.common.jvm
     implementation project(path: ':android-aop-annotation')
     implementation project(path: ':android-aop-core')
     ksp project(':android-aop-apt')

android-aop-extra/src/main/java/com/flyjingfish/android_aop_core/cut/OnLifecycleCut.kt

@@ -1,14 +1,11 @@
 package com.flyjingfish.android_aop_core.cut
 
 import android.os.Looper
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
 import com.flyjingfish.android_aop_annotation.ProceedJoinPoint
 import com.flyjingfish.android_aop_annotation.ProceedJoinPointSuspend
-import com.flyjingfish.android_aop_annotation.ProceedReturn
-import com.flyjingfish.android_aop_annotation.base.BasePointCut
 import com.flyjingfish.android_aop_annotation.base.BasePointCutSuspend
 import com.flyjingfish.android_aop_core.annotations.OnLifecycle
 import com.flyjingfish.android_aop_core.utils.AppExecutors

android-aop-plugin/src/main/kotlin/com/flyjingfish/android_aop_plugin/plugin/CompilePlugin.kt

@@ -2,11 +2,9 @@ package com.flyjingfish.android_aop_plugin.plugin
 
 import com.android.build.api.variant.AndroidComponentsExtension
 import com.android.build.api.variant.Variant
-import com.android.build.gradle.AppExtension
 import com.android.build.gradle.AppPlugin
 import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.DynamicFeaturePlugin
-import com.android.build.gradle.LibraryExtension
 import com.android.build.gradle.LibraryPlugin
 import com.flyjingfish.android_aop_plugin.config.AndroidAopConfig
 import com.flyjingfish.android_aop_plugin.scanner_visitor.SuspendReturnScanner
@@ -23,15 +21,14 @@ import com.flyjingfish.android_aop_plugin.utils.WovenInfoUtils
 import com.flyjingfish.android_aop_plugin.utils.adapterOSPath
 import com.flyjingfish.android_aop_plugin.utils.getBuildDirectory
 import com.flyjingfish.android_aop_plugin.utils.getRelativePath
-import org.codehaus.groovy.runtime.DefaultGroovyMethods
 import org.gradle.api.Project
 import org.gradle.api.execution.TaskExecutionGraph
 import org.gradle.api.execution.TaskExecutionGraphListener
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.compile.AbstractCompile
 import org.gradle.api.tasks.compile.JavaCompile
-import org.gradle.configurationcache.extensions.capitalized
+import org.gradle.internal.extensions.stdlib.capitalized
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompileTool
 import java.io.File
 
@@ -192,25 +189,15 @@ class CompilePlugin(private val fromRootSet:Boolean): BasePlugin() {
         }
 
 
-        val android = androidObject as BaseExtension
-        val variants = if (isApp or isDynamicLibrary) {
-            (android as AppExtension).applicationVariants
-        } else {
-            (android as LibraryExtension).libraryVariants
-        }
-        variants.all { variant ->
-            val javaCompile: AbstractCompile =
-                if (DefaultGroovyMethods.hasProperty(variant, "javaCompileProvider") != null) {
-                    //gradle 4.10.1 +
-                    variant.javaCompileProvider.get()
-                } else if (DefaultGroovyMethods.hasProperty(variant, "javaCompiler") != null) {
-                    variant.javaCompiler as AbstractCompile
-                } else {
-                    variant.javaCompile as AbstractCompile
-                }
-            val variantName = variant.name
-            val buildTypeName = variant.buildType.name
-            if (!isIncremental() && javaCompile is JavaCompile && isDebugMode(buildTypeName,variantName)){
+        project.tasks.withType(JavaCompile::class.java).configureEach { javaCompile ->
+            val taskName = javaCompile.name
+
+            val variantName = taskName
+                .removePrefix("compile")
+                .removeSuffix("JavaWithJavac")
+                .replaceFirstChar { it.lowercase() }
+            val buildTypeName = null
+            if (!isIncremental() && isDebugMode(buildTypeName,variantName)){
                 javaCompile.options.isIncremental = false
             }
             if (isApp && isIncremental()){
@@ -232,54 +219,27 @@ class CompilePlugin(private val fromRootSet:Boolean): BasePlugin() {
         if (hasBuildConfig()){
             val androidComponents = project.extensions.getByType(AndroidComponentsExtension::class.java)
             val variantList: ArrayList<Variant> = ArrayList()
+            val android = project.extensions.getByName("android")
             androidComponents.onVariants { variant ->
                 variantList.add(variant)
                 val variantName = variant.name
                 val path = Utils.aopDebugModeJavaDir(variantName)
                 val debugModeDir = File("${project.getBuildDirectory().absolutePath}$path")
                 val variantNameCapitalized = variantName.capitalized()
-                var packageName = if (android.namespace == null || android.namespace == "null"){
-                    android.defaultConfig.applicationId.toString()
-                }else{
-                    android.namespace.toString()
-                }
-
-                if (packageName == "null"){
-                    for (sourceSet in android.sourceSets) {
-                        if (sourceSet.name == "main"){
-                            val pkName = getPackageName(sourceSet.java.srcDirs,debugModeDir)
-                            if (pkName != null){
-                                packageName = pkName
-                                break
-                            }
-                        }
+                var packageName = when (android) {
+                    is com.android.build.api.dsl.ApplicationExtension -> {
+                        (android.namespace ?: android.defaultConfig.applicationId)?:""
                     }
-                }
-
-                if (packageName == "null"){
-                    for (sourceSet in android.sourceSets) {
-                        if (sourceSet.name == "release"){
-                            val pkName = getPackageName(sourceSet.java.srcDirs,debugModeDir)
-                            if (pkName != null){
-                                packageName = pkName
-                                break
-                            }
-                        }
+                    is com.android.build.api.dsl.LibraryExtension -> {
+                        android.namespace ?:""
                     }
-                }
-
-                if (packageName == "null"){
-                    for (sourceSet in android.sourceSets) {
-                        if (sourceSet.name == "debug"){
-                            val pkName = getPackageName(sourceSet.java.srcDirs,debugModeDir)
-                            if (pkName != null){
-                                packageName = pkName
-                                break
-                            }
-                        }
+                    is BaseExtension -> {
+                        (android.namespace ?: android.defaultConfig.applicationId)?:""
                     }
+                    else -> ""
                 }
-                if (packageName.isEmpty()){
+
+                if (packageName.isEmpty() || packageName == "null"){
                     packageName = project.name.replace("-","_")
                 }
                 val buildTypeName: String? = variant.buildType
@@ -343,7 +303,7 @@ class CompilePlugin(private val fromRootSet:Boolean): BasePlugin() {
         return null
     }
 
-    private fun doAopTask(project: RuntimeProject,isApp:Boolean, variantName: String, buildTypeName: String,
+    private fun doAopTask(project: RuntimeProject,isApp:Boolean, variantName: String, buildTypeName: String?,
                           javaCompile:AbstractCompile, kotlinDefaultPath: File, isAndroidModule : Boolean = true, isDynamic : Boolean = false){
         val cacheDir = if (isAndroidModule) {
             kotlinCompileFilePathMap[project.buildDir.absolutePath+"@"+"compile${variantName.capitalized()}Kotlin"]
@@ -361,7 +321,7 @@ class CompilePlugin(private val fromRootSet:Boolean): BasePlugin() {
         if (AndroidAopConfig.enabled && debugMode){
             ClassFileUtils.debugMode = true
             val hint = "AndroidAOP Tip: You are using debugMode mode"
-            if (buildTypeName == "release"){
+            if (!buildTypeName.isNullOrEmpty() && buildTypeName.contains("release")){
                 logger.error(hint)
             }else{
                 logger.warn(hint)

android-aop-plugin/src/main/kotlin/com/flyjingfish/android_aop_plugin/plugin/TransformPlugin.kt

@@ -7,9 +7,7 @@ import com.android.build.gradle.internal.tasks.DexArchiveBuilderTask
 import com.flyjingfish.android_aop_plugin.config.AndroidAopConfig
 import com.flyjingfish.android_aop_plugin.tasks.AssembleAndroidAopTask
 import com.flyjingfish.android_aop_plugin.utils.AppClasses
-import com.flyjingfish.android_aop_plugin.utils.InitConfig
 import com.flyjingfish.android_aop_plugin.utils.RuntimeProject
-import io.github.flyjingfish.fast_transform.tasks.DefaultTransformTask
 import io.github.flyjingfish.fast_transform.toTransformAll
 import org.gradle.api.Project
 import org.gradle.api.Task

android-aop-plugin/src/main/kotlin/com/flyjingfish/android_aop_plugin/utils/RuntimeProject.kt

@@ -1,7 +1,9 @@
 package com.flyjingfish.android_aop_plugin.utils
 
+import com.android.build.api.variant.AndroidComponentsExtension
 import com.android.build.gradle.BaseExtension
 import org.gradle.api.Project
+import org.gradle.api.file.RegularFile
 import java.io.File
 import java.io.Serializable
 
@@ -49,7 +51,19 @@ data class RuntimeProject(
                 if (android != null){
                     runtimeProject.androidConfig.setBootClasspath(android.bootClasspath)
                 }
-            } catch (_: Throwable) {
+            } catch (e: Throwable) {
+                try {
+                    val androidComponents = project.extensions.getByType(AndroidComponentsExtension::class.java)
+                    val sdkComponents = androidComponents::sdkComponents.get()
+//                    println("sdkDirectory: $sdkDirectory")
+//                    val sdkDirectory: Directory? = sdkComponents.sdkDirectory.get()
+                    val bootClasspath: List<RegularFile> = sdkComponents.bootClasspath.get()
+
+//                    bootClasspath.forEach { println("bootClasspath: ${it.asFile.absolutePath}") }
+                    runtimeProject.androidConfig.setBootClasspath(bootClasspath.map { it.asFile })
+                } catch (e: Exception) {
+//                    e.printStackTrace()
+                }
             }
         }
     }

app/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
+//    id 'org.jetbrains.kotlin.android'
     id 'com.google.devtools.ksp'
     id 'kotlinx-serialization'
     id 'easy.register'

build.gradle

@@ -9,11 +9,11 @@ buildscript {
 plugins {
     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.android' version '2.2.20' 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 '2.3.2' apply false
+    id 'com.google.devtools.ksp' version '2.3.6' 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

dynamicfeature/build.gradle

@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.android.dynamic.feature)
-    alias(libs.plugins.kotlin.android)
     id 'android.aop'
 }
 apply from: "$rootDir/gradle/android_base.gradle"
@@ -40,4 +39,5 @@ android {
 dependencies {
     implementation project(":app")
     implementation project(":test-lib")
+    implementation libs.androidx.core.ktx
 }