From 2addebe117d47b8ada07928a68ecd0bd43c0cff7 Mon Sep 17 00:00:00 2001 From: Ting-Yuan Huang Date: Mon, 23 Sep 2024 16:43:21 -0700 Subject: [PATCH] Associate KSP with the inputs to JavaCompile --- .../com/google/devtools/ksp/gradle/KspSubplugin.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 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 index 1882f1c7e6..8bb587b7df 100644 --- 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(processResourcesTaskName)?.let { provider ->