From 80f95528c26ccbe7f87c66aa324981d7e85816ed Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Fri, 16 Apr 2021 12:29:35 +0200 Subject: [PATCH] [MPP] Always use native plugin artifact for native compilations #KT-46122 Fixed --- .../jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 3803c4ff817..2fd9f092135 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 @@ -7,10 +7,7 @@ import org.gradle.api.tasks.compile.AbstractCompile import org.gradle.api.tasks.compile.JavaCompile import org.jetbrains.kotlin.gradle.dsl.KotlinCompile import org.jetbrains.kotlin.gradle.logging.kotlinDebug -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget -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.AbstractKotlinCompile import org.jetbrains.kotlin.gradle.tasks.CompilerPluginOptions import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile @@ -67,7 +64,7 @@ class SubpluginEnvironment( project.logger.kotlinDebug { "Loading subplugin $pluginId" } - if (kotlinCompilation.platformType == KotlinPlatformType.native) { + if (kotlinCompilation is AbstractKotlinNativeCompilation) { subplugin.getPluginArtifactForNative()?.let { artifact -> project.addMavenDependency(kotlinCompilation.pluginConfigurationName, artifact) }