diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt index b0bdffca6c2..d6acf3d8966 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt @@ -124,7 +124,6 @@ interface KotlinCompilerPluginSupportPlugin : Plugin { fun getCompilerPluginId(): String fun getPluginArtifact(): SubpluginArtifact fun getPluginArtifactForNative(): SubpluginArtifact? = null - fun getPluginArtifactForNative(project: Project): SubpluginArtifact? = getPluginArtifactForNative() } open class SubpluginArtifact(val groupId: String, val artifactId: String, val version: String? = null) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt index e679ad244ba..3c10752fb71 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt @@ -72,7 +72,7 @@ class SubpluginEnvironment( if (kotlinCompilation is AbstractKotlinNativeCompilation) { - subplugin.getPluginArtifactForNative(project)?.let { artifact -> + subplugin.getPluginArtifactForNative()?.let { artifact -> project.addMavenDependency(kotlinCompilation.pluginConfigurationName, artifact) } } else { diff --git a/libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt b/libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt index 8fa61c60a33..8b41551ed36 100644 --- a/libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt +++ b/libraries/tools/kotlin-serialization/src/main/kotlin/org/jetbrains/kotlinx/serialization/gradle/SerializationSubplugin.kt @@ -50,12 +50,6 @@ class SerializationGradleSubplugin : override fun getPluginArtifactForNative(): SubpluginArtifact? = SubpluginArtifact(SERIALIZATION_GROUP_NAME, SERIALIZATION_ARTIFACT_UNSHADED_NAME) - override fun getPluginArtifactForNative(project: Project): SubpluginArtifact? = - if (project.isNativeEmbedded) - getPluginArtifact() - else getPluginArtifactForNative() - - override fun getCompilerPluginId() = "org.jetbrains.kotlinx.serialization" //region Stub implementation for legacy API, KT-39809 @@ -69,9 +63,4 @@ class SerializationGradleSubplugin : "Please use an older version of kotlin-serialization or upgrade the Kotlin Gradle plugin version to make them match." ) //endregion - - // TODO: find better place (see org.jetbrains.kotlin.compilerRunner.KotlinNativeToolRunner.isNativeEmbedded) - private val Project.isNativeEmbedded: Boolean - get() = findProperty("kotlin.native.shaded")?.toString()?.toBoolean() == true - }