Associate KSP with the inputs to JavaCompile

google · Sep 24, 2024 · 2addebe · 2addebe
1 parent 9faf216
commit 2addebe
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt
@@ -280,13 +280,6 @@ class KspGradleSubplugin @Inject internal constructor(private val registry: Tool
             "$KSP_GROUP_ID:$KSP_COMPILER_PLUGIN_ID_NON_EMBEDDABLE:$KSP_VERSION"
         )
 
-        findJavaTaskForKotlinCompilation(kotlinCompilation)?.configure { javaCompile ->
-            val generatedJavaSources = javaCompile.project.fileTree(javaOutputDir)
-            generatedJavaSources.include("**/*.java")
-            javaCompile.source(generatedJavaSources)
-            javaCompile.classpath += project.files(classOutputDir)
-        }
-
         assert(kotlinCompileProvider.name.startsWith("compile"))
         val kspTaskName = kotlinCompileProvider.name.replaceFirst("compile", "ksp")
 
@@ -605,6 +598,13 @@ class KspGradleSubplugin @Inject internal constructor(private val registry: Tool
             }
         }
 
+        findJavaTaskForKotlinCompilation(kotlinCompilation)?.configure { javaCompile ->
+            val generatedJavaSources = javaCompile.project.fileTree(javaOutputDir).builtBy(kspTaskProvider)
+            generatedJavaSources.include("**/*.java")
+            javaCompile.source(generatedJavaSources)
+            javaCompile.classpath += project.files(classOutputDir)
+        }
+
         val processResourcesTaskName =
             (kotlinCompilation as? KotlinCompilationWithResources)?.processResourcesTaskName ?: "processResources"
         project.locateTask<ProcessResources>(processResourcesTaskName)?.let { provider ->