Fix circular dependency with KAPT - feedback changes

(cherry picked from commit 7e0cb46)
google · Mar 7, 2024 · 65a58e3 · 65a58e3
1 parent f250d02
commit 65a58e3
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/AndroidPluginIntegration.kt b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/AndroidPluginIntegration.kt
@@ -23,9 +23,11 @@ import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.file.FileCollection
 import org.gradle.api.tasks.TaskProvider
+import org.jetbrains.kotlin.gradle.internal.KaptTask
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmAndroidCompilation
 import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly
 import java.io.File
+import java.util.concurrent.Callable
 
 /**
  * This helper class handles communication with the android plugin.
@@ -77,26 +79,26 @@ object AndroidPluginIntegration {
         val kaptProvider: TaskProvider<Task>? =
             project.locateTask(kotlinCompilation.compileTaskProvider.kaptTaskName)
 
-        kotlinCompilation.androidVariant.getSourceFolders(SourceKind.JAVA).forEach { source ->
-            kspTaskProvider.configure { task ->
-                // this is workaround for KAPT generator that prevents circular dependency
-                val isKaptOutput =
-                    kaptProvider?.let { it.get().outputs.files.toList().any { file -> source.dir == file } } ?: false
-                if (!isKaptOutput) {
-                    when (task) {
-                        is KspTaskJvm -> {
-                            task.setSource(source)
-                            task.dependsOn(source)
-                        }
-
-                        is KspAATask -> {
-                            task.kspConfig.javaSourceRoots.from(source)
-                            task.dependsOn(source)
-                        }
+        val sources = kotlinCompilation.androidVariant.getSourceFolders(SourceKind.JAVA)
+        kspTaskProvider.configure { task ->
+            // this is workaround for KAPT generator that prevents circular dependency
+            val filteredSources = Callable {
+                val destinationProperty = (kaptProvider?.get() as? KaptTask)?.destinationDir
+                val dir = destinationProperty?.get()?.asFile
+                sources.filter { dir?.isParentOf(it.dir) == false }
+            }
+            when (task) {
+                is KspTaskJvm -> {
+                    task.setSource(filteredSources)
+                    task.dependsOn(filteredSources)
+                }
 
-                        else -> Unit
-                    }
+                is KspAATask -> {
+                    task.kspConfig.javaSourceRoots.from(filteredSources)
+                    task.dependsOn(filteredSources)
                 }
+
+                else -> Unit
             }
         }
     }