Skip to content

Commit 348cf16

Browse files
neetopiating-yuan
authored andcommitted
UPDATE_KOTLIN_VERSION: 1.9.20-dev-6963
1 parent f8fc0a4 commit 348cf16

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

gradle-plugin/src/main/kotlin/com/google/devtools/ksp/gradle/KspSubplugin.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
5454
import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact
5555
import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
5656
import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
57-
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinCommonCompilation
58-
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmAndroidCompilation
59-
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmCompilation
60-
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinWithJavaCompilation
57+
import org.jetbrains.kotlin.gradle.plugin.mpp.*
6158
import org.jetbrains.kotlin.gradle.tasks.*
6259
import org.jetbrains.kotlin.incremental.ChangedFiles
6360
import org.jetbrains.kotlin.incremental.isJavaFile
@@ -217,6 +214,9 @@ class KspGradleSubplugin @Inject internal constructor(private val registry: Tool
217214
if (kotlinCompileProvider.name == "compileKotlinMetadata") {
218215
return project.provider { emptyList() }
219216
}
217+
if ((kotlinCompilation as? KotlinSharedNativeCompilation)?.platformType == KotlinPlatformType.common) {
218+
return project.provider { emptyList() }
219+
}
220220

221221
val target = kotlinCompilation.target.name
222222
val sourceSetName = kotlinCompilation.defaultSourceSet.name
@@ -493,7 +493,6 @@ class KspGradleSubplugin @Inject internal constructor(private val registry: Tool
493493
KotlinPlatformType.common -> {
494494
KotlinFactories.registerKotlinMetadataCompileTask(project, kspTaskName, kotlinCompilation).also {
495495
it.configure { kspTask ->
496-
val kotlinCompileTask = kotlinCompileProvider.get() as KotlinCompileCommon
497496
maybeBlockOtherPlugins(kspTask as BaseKotlinCompile)
498497
configureAsKspTask(kspTask, isIncremental)
499498
configureAsAbstractKotlinCompileTool(kspTask as AbstractKotlinCompileTool<*>)

integration-tests/src/test/kotlin/com/google/devtools/ksp/test/KMPImplementedIT.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ class KMPImplementedIT {
329329
gradleRunner.withArguments(
330330
"--configuration-cache-problems=warn",
331331
"clean",
332-
"build",
332+
":workload:build",
333333
"-Pksp.allow.all.target.configuration=false"
334334
).buildAndFail().apply {
335335
Assert.assertTrue(
@@ -344,7 +344,7 @@ class KMPImplementedIT {
344344
gradleRunner.withArguments(
345345
"--configuration-cache-problems=warn",
346346
"clean",
347-
"build"
347+
":workload:build",
348348
).build().apply {
349349
Assert.assertTrue(
350350
messages.all {

0 commit comments

Comments
 (0)