Feature/agp7.4 (#19)

* MOD: compatible with agp7.4 * FIX: DefaultLifecycleObserver compatibility problems * ADD: Build apk check * ADD: agp test case * MOD: add generated code to srcDir logic * FIX: add generate code to sourceSet --------- Co-authored-by: jiangjunxiang <[email protected]>
kanyun-inc · Jan 28, 2023 · a50d2a9 · a50d2a9
1 parent d171395
commit a50d2a9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/kace-gradle-plugin/src/main/java/com/kanyun/kace/gradle/KaceGradlePlugin.kt b/kace-gradle-plugin/src/main/java/com/kanyun/kace/gradle/KaceGradlePlugin.kt
@@ -23,6 +23,7 @@ import com.android.build.gradle.api.BaseVariant
 import com.kanyun.kace.BuildConfig
 import com.kanyun.kace.gradle.utils.addCustomVariantLayoutDir
 import com.kanyun.kace.gradle.utils.addSourceSetLayoutDir
+import com.kanyun.kace.gradle.utils.configSourceSetDir
 import com.kanyun.kace.gradle.utils.getApplicationPackage
 import com.kanyun.kace.gradle.utils.withAllPlugins
 import java.io.File
@@ -57,6 +58,9 @@ class KaceGradlePlugin : Plugin<Project> {
             val compileKotlin = target.tasks.getByName("compile${variantCapitalizeName}Kotlin")
             val sourceOutputDir =
                 File(target.buildDir, "generated/source/kace/${variant.dirName}")
+            val sourceSet = extension.sourceSets.getByName(variant.name)
+            configSourceSetDir(sourceSet, sourceOutputDir, target.logger)
+
             val relativePath =
                 target.projectDir.toPath().relativize(sourceOutputDir.toPath()).toString()
             (compileKotlin as KotlinCompile).source(relativePath)

diff --git a/kace-gradle-plugin/src/main/java/com/kanyun/kace/gradle/utils/PluginUtils.kt b/kace-gradle-plugin/src/main/java/com/kanyun/kace/gradle/utils/PluginUtils.kt
@@ -16,12 +16,16 @@
 
 package com.kanyun.kace.gradle.utils
 
+import com.android.build.api.dsl.AndroidSourceDirectorySet
 import com.android.build.gradle.BaseExtension
+import com.android.build.gradle.api.AndroidSourceSet
 import com.kanyun.kace.gradle.LayoutDir
 import java.io.File
 import java.lang.reflect.Field
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.logging.LogLevel
+import org.gradle.api.logging.Logger
 
 internal fun Project.withAllPlugins(vararg pluginIds: String, action: (List<Plugin<*>>) -> Unit) {
     return withAllPlugins(pluginIds.toList(), action)
@@ -114,3 +118,18 @@ private fun getField(clazz: Class<*>, name: String): Field {
         }
     }
 }
+
+internal fun configSourceSetDir(
+    sourceSet: AndroidSourceSet,
+    sourceOutputDir: File,
+    logger: Logger
+) {
+    try {
+        val kotlinSourceSet = getFieldValue(sourceSet, "kotlin") as? AndroidSourceDirectorySet
+        kotlinSourceSet?.srcDir(sourceOutputDir)
+        return
+    } catch (e: Exception) {
+        logger.log(LogLevel.INFO, "sourceSet has no kotlin field")
+    }
+    sourceSet.java.srcDir(sourceOutputDir)
+}