remove module name mangling workaround

(cherry picked from commit 67b1a5f)
google · Mar 29, 2023 · c11807b · c11807b
1 parent f1e32f0
commit c11807b
Show file tree

Hide file tree

Showing 2 changed files 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
@@ -421,7 +421,14 @@ class KspGradleSubplugin @Inject internal constructor(private val registry: Tool
                         configurePluginOptions(kspTask)
                         kspTask.compilerOptions.noJdk.value(kotlinCompileTask.compilerOptions.noJdk)
                         configureLanguageVersion(kspTask)
-                        kspTask.compilerOptions.moduleName.convention(kotlinCompileTask.moduleName.map { "$it-ksp" })
+                        if (kspTask.classpathSnapshotProperties.useClasspathSnapshot.get() == false) {
+                            kspTask.compilerOptions.moduleName.convention(
+                                kotlinCompileTask.moduleName.map { "$it-ksp" }
+                            )
+                        } else {
+                            kspTask.compilerOptions.moduleName.convention(kotlinCompileTask.moduleName)
+                        }
+
                         kspTask.moduleName.value(kotlinCompileTask.moduleName.get())
                         kspTask.destination.value(kspOutputDir)
 
@@ -456,7 +463,7 @@ class KspGradleSubplugin @Inject internal constructor(private val registry: Tool
                         kspTask.compilerOptions.freeCompilerArgs
                             .value(kotlinCompileTask.compilerOptions.freeCompilerArgs)
                         configureLanguageVersion(kspTask)
-                        kspTask.compilerOptions.moduleName.convention(kotlinCompileTask.moduleName.map { "$it-ksp" })
+                        kspTask.compilerOptions.moduleName.convention(kotlinCompileTask.moduleName)
 
                         kspTask.incrementalChangesTransformers.add(
                             createIncrementalChangesTransformer(

diff --git a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AndroidIncrementalIT.kt b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/AndroidIncrementalIT.kt
@@ -30,11 +30,11 @@ class AndroidIncrementalIT {
     @JvmField
     val project: TemporaryTestProject = TemporaryTestProject("playground-android-multi", "playground")
 
-    @Test
-    fun testPlaygroundAndroid() {
+    private fun testWithExtraFlags(vararg extras: String) {
         val gradleRunner = GradleRunner.create().withProjectDir(project.root)
 
         gradleRunner.withArguments(
+            *extras,
             "clean", ":application:compileDebugKotlin", "--configuration-cache-problems=warn", "--debug", "--stacktrace"
         ).build().let { result ->
             Assert.assertEquals(TaskOutcome.SUCCESS, result.task(":workload:compileDebugKotlin")?.outcome)
@@ -51,6 +51,7 @@ class AndroidIncrementalIT {
         }
 
         gradleRunner.withArguments(
+            *extras,
             ":application:compileDebugKotlin", "--configuration-cache-problems=warn", "--debug", "--stacktrace"
         ).build().let { result ->
             Assert.assertEquals(
@@ -59,4 +60,14 @@ class AndroidIncrementalIT {
             )
         }
     }
+
+    @Test
+    fun testPlaygroundAndroid() {
+        testWithExtraFlags()
+    }
+
+    @Test
+    fun testPlaygroundAndroidUseClasspathSnapshotFalse() {
+        testWithExtraFlags("-Pkotlin.incremental.useClasspathSnapshot=false")
+    }
 }