use file collection to support configuration caching

yigit · Oct 15, 2023 · 9338edc · 9338edc
1 parent 38cea31
commit 9338edc
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 9 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
@@ -538,7 +538,11 @@ class KspGradleSubplugin @Inject internal constructor(private val registry: Tool
                         }
                         kspTask.commonSources.from(kotlinCompileTask.commonSources)
                         kspTask.options.add(
-                            ClasspathFilesSubpluginOption("apclasspath", processorClasspath)
+                            FileCollectionSubpluginOption.create(
+                                project = project,
+                                name = "apclasspath",
+                                classpath = processorClasspath
+                            )
                         )
                         kspTask.compilerOptions.freeCompilerArgs.addAll(
                             kspTask.options.map {
@@ -794,15 +798,30 @@ internal fun Configuration.markResolvable(): Configuration = apply {
 }
 
 /**
- * A [SubpluginOption] that returns the joined path for files in the given [configuration].
+ * A [SubpluginOption] that returns the joined path for files in the given [fileCollection].
  */
-internal class ClasspathFilesSubpluginOption(
+internal class FileCollectionSubpluginOption(
     key: String,
-    val configuration: Configuration
+    val fileCollection: ConfigurableFileCollection
 ) : SubpluginOption(
     key = key,
     lazyValue = lazy {
-        val files = configuration.resolve()
+        val files = fileCollection.files
         files.joinToString(File.pathSeparator) { it.normalize().absolutePath }
     }
-)
+) {
+    companion object {
+        fun create(
+            project: Project,
+            name: String,
+            classpath: Configuration
+        ): FileCollectionSubpluginOption {
+            val fileCollection = project.objects.fileCollection()
+            fileCollection.from(classpath)
+            return FileCollectionSubpluginOption(
+                key = name,
+                fileCollection = fileCollection
+            )
+        }
+    }
+}
diff --git a/...in/src/test/kotlin/com/google/devtools/ksp/gradle/ProcessorClasspathConfigurationsTest.kt b/...in/src/test/kotlin/com/google/devtools/ksp/gradle/ProcessorClasspathConfigurationsTest.kt
@@ -16,6 +16,7 @@
  */
 package com.google.devtools.ksp.gradle
 
+import com.google.common.truth.Truth.assertThat
 import com.google.devtools.ksp.gradle.testing.KspIntegrationTestRule
 import org.junit.Rule
 import org.junit.Test
@@ -151,9 +152,19 @@ class ProcessorClasspathConfigurationsTest {
         )
         // trigger task creation. KSP should not resolve classpaths
         // at this step
-        testRule.runner()
+        val buildResult = testRule.runner()
             .withArguments(":app:tasks")
             .build()
+        val taskNames = listOf(
+            "kspKotlinJs",
+            "kspKotlinJvm",
+            "kspKotlinLinuxX64",
+        )
+        taskNames.forEach {
+            assertThat(
+                buildResult.output
+            ).contains(it)
+        }
     }
 
     @Test
@@ -183,8 +194,18 @@ class ProcessorClasspathConfigurationsTest {
         )
         // trigger task creation. KSP should not resolve arguments
         // at this step
-        testRule.runner()
-            .withArguments(":app:tasks")
+        val buildResult = testRule.runner()
+            .withArguments(":app:tasks", "--all")
             .build()
+        val taskNames = listOf(
+            "kspKotlinJs",
+            "kspKotlinJvm",
+            "kspKotlinLinuxX64",
+        )
+        taskNames.forEach {
+            assertThat(
+                buildResult.output
+            ).contains(it)
+        }
     }
 }