UPDATE_KOTLIN_VERSION: 1.9.20-dev-6963

google · Sep 11, 2023 · 348cf16 · 348cf16
1 parent f8fc0a4
commit 348cf16
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -54,10 +54,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact
 import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
 import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinCommonCompilation
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmAndroidCompilation
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmCompilation
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinWithJavaCompilation
+import org.jetbrains.kotlin.gradle.plugin.mpp.*
 import org.jetbrains.kotlin.gradle.tasks.*
 import org.jetbrains.kotlin.incremental.ChangedFiles
 import org.jetbrains.kotlin.incremental.isJavaFile
@@ -217,6 +214,9 @@ class KspGradleSubplugin @Inject internal constructor(private val registry: Tool
         if (kotlinCompileProvider.name == "compileKotlinMetadata") {
             return project.provider { emptyList() }
         }
+        if ((kotlinCompilation as? KotlinSharedNativeCompilation)?.platformType == KotlinPlatformType.common) {
+            return project.provider { emptyList() }
+        }
 
         val target = kotlinCompilation.target.name
         val sourceSetName = kotlinCompilation.defaultSourceSet.name
@@ -493,7 +493,6 @@ class KspGradleSubplugin @Inject internal constructor(private val registry: Tool
             KotlinPlatformType.common -> {
                 KotlinFactories.registerKotlinMetadataCompileTask(project, kspTaskName, kotlinCompilation).also {
                     it.configure { kspTask ->
-                        val kotlinCompileTask = kotlinCompileProvider.get() as KotlinCompileCommon
                         maybeBlockOtherPlugins(kspTask as BaseKotlinCompile)
                         configureAsKspTask(kspTask, isIncremental)
                         configureAsAbstractKotlinCompileTool(kspTask as AbstractKotlinCompileTool<*>)

diff --git a/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/KMPImplementedIT.kt b/integration-tests/src/test/kotlin/com/google/devtools/ksp/test/KMPImplementedIT.kt
@@ -329,7 +329,7 @@ class KMPImplementedIT {
         gradleRunner.withArguments(
             "--configuration-cache-problems=warn",
             "clean",
-            "build",
+            ":workload:build",
             "-Pksp.allow.all.target.configuration=false"
         ).buildAndFail().apply {
             Assert.assertTrue(
@@ -344,7 +344,7 @@ class KMPImplementedIT {
         gradleRunner.withArguments(
             "--configuration-cache-problems=warn",
             "clean",
-            "build"
+            ":workload:build",
         ).build().apply {
             Assert.assertTrue(
                 messages.all {