prototype to possible solution for early classpath resolution

yigit · Oct 14, 2023 · 7af4fb5 · 7af4fb5
1 parent 4a853a6
commit 7af4fb5
Showing 1 changed file with 22 additions and 4 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
@@ -537,10 +537,16 @@ class KspGradleSubplugin @Inject internal constructor(private val registry: Tool
                             kspTask.compilerPluginOptions.addPluginArgument(kotlinCompileTask.compilerPluginOptions)
                         }
                         kspTask.commonSources.from(kotlinCompileTask.commonSources)
-                        kspTask.options.add(FilesSubpluginOption("apclasspath", processorClasspath.files.toList()))
-                        val kspOptions = kspTask.options.get().flatMap { listOf("-P", it.toArg()) }
-                        kspTask.compilerOptions.freeCompilerArgs.value(
-                            kspOptions + kotlinCompileTask.compilerOptions.freeCompilerArgs.get()
+                        kspTask.options.add(
+                            ClasspathFilesSubpluginOption("apclasspath", processorClasspath)
+                        )
+                        kspTask.compilerOptions.freeCompilerArgs.addAll(
+                            kspTask.options.map {
+                                it.flatMap { listOf("-P", it.toArg()) }
+                            }
+                        )
+                        kspTask.compilerOptions.freeCompilerArgs.addAll(
+                            kotlinCompileTask.compilerOptions.freeCompilerArgs
                         )
                         configureLanguageVersion(kspTask)
                         // Cannot use lambda; See below for details.
@@ -786,3 +792,15 @@ internal fun Configuration.markResolvable(): Configuration = apply {
     isCanBeConsumed = false
     isVisible = false
 }
+
+
+internal class ClasspathFilesSubpluginOption(
+    key: String,
+    val configuration: Configuration
+) : SubpluginOption(
+    key = key,
+    lazyValue = lazy<String> {
+        val files = configuration.resolve()
+        files.joinToString(File.pathSeparator) { it.normalize().absolutePath }
+    }
+)