1、修复org.gradle.configuration-cache=true时无法编译的bug

2、新增 includeKotlin 配置

Author: FlyJingFish

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

@@ -21,6 +21,11 @@ open class AndroidAopConfig {
      */
     var cutInfoJson = false
 
+    /**
+     * 是否扫描包含 kotlinx、kotlin 下的包，默认 false 不扫描
+     */
+    var includeKotlin = false
+
     /**
      * 增量加速，有一定增速效果，默认开启
      */
@@ -79,6 +84,7 @@ open class AndroidAopConfig {
         AndroidAopConfig.excludes.add(Utils.extraPackage)
         AndroidAopConfig.verifyLeafExtends = verifyLeafExtends
         AndroidAopConfig.cutInfoJson = cutInfoJson
+        AndroidAopConfig.includeKotlin = includeKotlin
 //        AndroidAopConfig.increment = increment
     }
 
@@ -95,6 +101,7 @@ open class AndroidAopConfig {
         var verifyLeafExtends = true
         var cutInfoJson = false
         var increment = false
+        var includeKotlin = false
         internal fun syncConfig(project: Project){
             val androidAopConfig = project.extensions.getByType(AndroidAopConfig::class.java)
             androidAopConfig.initConfig()

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

@@ -13,7 +13,6 @@ import com.flyjingfish.android_aop_plugin.scanner_visitor.SuspendReturnScanner
 import com.flyjingfish.android_aop_plugin.scanner_visitor.WovenIntoCode
 import com.flyjingfish.android_aop_plugin.tasks.CompileAndroidAopTask
 import com.flyjingfish.android_aop_plugin.tasks.DebugModeFileTask
-import com.flyjingfish.android_aop_plugin.utils.AppClasses
 import com.flyjingfish.android_aop_plugin.utils.ClassFileUtils
 import com.flyjingfish.android_aop_plugin.utils.ClassPoolUtils
 import com.flyjingfish.android_aop_plugin.utils.FileHashUtils
@@ -25,13 +24,9 @@ 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.BuildListener
-import org.gradle.BuildResult
 import org.gradle.api.Project
 import org.gradle.api.execution.TaskExecutionGraph
 import org.gradle.api.execution.TaskExecutionGraphListener
-import org.gradle.api.initialization.Settings
-import org.gradle.api.invocation.Gradle
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.compile.AbstractCompile
@@ -184,24 +179,13 @@ class CompilePlugin(private val fromRootSet:Boolean): BasePlugin() {
                             InitConfig.initCutInfo(runtimeProject,true)
                         }
                     }
-                    project.rootProject.gradle.taskGraph.removeTaskExecutionGraphListener(this)
-                }
-
-            })
-            project.rootProject.gradle.addBuildListener(object : BuildListener{
-                override fun settingsEvaluated(settings: Settings) {
-                }
-
-                override fun projectsLoaded(gradle: Gradle) {
-                }
-
-                override fun projectsEvaluated(gradle: Gradle) {
-                }
-
-                override fun buildFinished(result: BuildResult) {
-                    if (startTask){
-                        endAllTask()
+                    val lastTask = it.allTasks.last()
+                    lastTask.doLast {
+                        if (startTask){
+                            endAllTask()
+                        }
                     }
+                    project.rootProject.gradle.taskGraph.removeTaskExecutionGraphListener(this)
                 }
 
             })
@@ -458,9 +442,11 @@ class CompilePlugin(private val fromRootSet:Boolean): BasePlugin() {
     }
 
     private fun endAllTask(){
-        FileHashUtils.clearScanRecord()
-        WovenInfoUtils.clear()
-        ClassPoolUtils.clear()
-        SuspendReturnScanner.hasSuspendReturn = false
+        synchronized(CompilePlugin::class.java){
+            FileHashUtils.clearScanRecord()
+            WovenInfoUtils.clear()
+            ClassPoolUtils.clear()
+            SuspendReturnScanner.hasSuspendReturn = false
+        }
     }
 }

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

@@ -333,7 +333,7 @@ abstract class AssembleAndroidAopTask : DefaultTransformTask() {
                     val isClassFile = file.name.endsWith(_CLASS)
                     val isWovenInfoCode = isClassFile
                             && AndroidAopConfig.inRules(thisClassName)
-                            && !entryClazzName.startsWith("kotlinx/") && !entryClazzName.startsWith("kotlin/")
+                            && (AndroidAopConfig.includeKotlin || (!entryClazzName.startsWith("kotlinx/") && !entryClazzName.startsWith("kotlin/")))
 
                     val methodsRecord: HashMap<String, MethodRecord>? = WovenInfoUtils.getClassMethodRecord(file.absolutePath)
                     val isSuspend:Boolean
@@ -578,7 +578,7 @@ abstract class AssembleAndroidAopTask : DefaultTransformTask() {
                         val isClassFile = entryName.endsWith(_CLASS)
                         val isWovenInfoCode = isClassFile
                                 && AndroidAopConfig.inRules(thisClassName)
-                                && !entryName.startsWith("kotlinx/") && !entryName.startsWith("kotlin/")
+                                && (AndroidAopConfig.includeKotlin || (!entryName.startsWith("kotlinx/") && !entryName.startsWith("kotlin/")))
                         val methodsRecord: HashMap<String, MethodRecord>? = WovenInfoUtils.getClassMethodRecord(entryName)
                         val isSuspend:Boolean
                         val realMethodsRecord: HashMap<String, MethodRecord>? = if (methodsRecord == null && SuspendReturnScanner.hasSuspendReturn && isWovenInfoCode){

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

@@ -181,7 +181,7 @@ class CompileAndroidAopTask(
                 val isClassFile = file.name.endsWith(_CLASS)
                 val isWovenInfoCode = isClassFile
                         && AndroidAopConfig.inRules(thisClassName)
-                        && !entryClazzName.startsWith("kotlinx/") && !entryClazzName.startsWith("kotlin/")
+                        && (AndroidAopConfig.includeKotlin || (!entryClazzName.startsWith("kotlinx/") && !entryClazzName.startsWith("kotlin/")))
 
                 val methodsRecord: HashMap<String, MethodRecord>? = WovenInfoUtils.getClassMethodRecord(file.absolutePath)
                 val isSuspend:Boolean

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

@@ -63,9 +63,8 @@ class AopTaskUtils(
                 searchJobs.add(job)
 //                processJar()
             } else if (file.absolutePath.endsWith(_CLASS)) {
-                if (AndroidAopConfig.verifyLeafExtends && !className.startsWith("kotlinx/") && !className.startsWith(
-                        "kotlin/"
-                    )
+                if (AndroidAopConfig.verifyLeafExtends &&
+                    (AndroidAopConfig.includeKotlin || (!className.startsWith("kotlinx/") && !className.startsWith("kotlin/")))
                 ) {
 
                     fun processJar(){
@@ -126,9 +125,8 @@ class AopTaskUtils(
                     searchJobs.add(job)
 //                    processJar()
                 } else if (entryName.endsWith(_CLASS)) {
-                    if (AndroidAopConfig.verifyLeafExtends && !entryName.startsWith("kotlinx/") && !entryName.startsWith(
-                            "kotlin/"
-                        )
+                    if (AndroidAopConfig.verifyLeafExtends &&
+                        (AndroidAopConfig.includeKotlin || (!entryName.startsWith("kotlinx/") && !entryName.startsWith("kotlin/")))
                     ) {
                         fun processJar(){
                             jarFile.getInputStream(jarEntry).use { inputs ->