KSP2: include KotlinPlatformType.androidJvm in incremental libs

ting-yuan · KSP Auto Pick · commit b541b46d43cf · 2025-04-08T02:36:34.000Z
(cherry picked from commit f244bfc)
diff --git a/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspAATask.kt b/gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspAATask.kt
@@ -91,27 +91,30 @@ abstract class KspAATask @Inject constructor(
         }
 
         val changedClasses = if (kspConfig.incremental.get()) {
-            if (kspConfig.platformType.get() == KotlinPlatformType.jvm) {
-                getCPChanges(
-                    inputChanges,
-                    listOf(
-                        kspConfig.sourceRoots,
-                        kspConfig.javaSourceRoots,
-                        kspConfig.commonSourceRoots,
+            when (kspConfig.platformType.get()) {
+                KotlinPlatformType.jvm, KotlinPlatformType.androidJvm -> {
+                    getCPChanges(
+                        inputChanges,
+                        listOf(
+                            kspConfig.sourceRoots,
+                            kspConfig.javaSourceRoots,
+                            kspConfig.commonSourceRoots,
+                            kspConfig.classpathStructure,
+                        ),
+                        kspConfig.cachesDir.asFile.get(),
                         kspConfig.classpathStructure,
-                    ),
-                    kspConfig.cachesDir.asFile.get(),
-                    kspConfig.classpathStructure,
-                    kspConfig.libraries,
-                    kspConfig.processorClasspath,
-                )
-            } else {
-                if (
-                    !inputChanges.isIncremental ||
-                    inputChanges.getFileChanges(kspConfig.nonJvmLibraries).iterator().hasNext()
-                )
-                    kspConfig.cachesDir.get().asFile.deleteRecursively()
-                emptyList()
+                        kspConfig.libraries,
+                        kspConfig.processorClasspath,
+                    )
+                }
+                else -> {
+                    if (
+                        !inputChanges.isIncremental ||
+                        inputChanges.getFileChanges(kspConfig.nonJvmLibraries).iterator().hasNext()
+                    )
+                        kspConfig.cachesDir.get().asFile.deleteRecursively()
+                    emptyList()
+                }
             }
         } else {
             kspConfig.cachesDir.get().asFile.deleteRecursively()
