azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MPP] Always use native plugin artifact for native compilations

Browse Source 
#KT-46122 Fixed
This commit is contained in:
Anton Lakotka
2021-04-16 12:29:35 +02:00
committed by TeamCityServer
parent d75d42da9d
commit 80f95528c2
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/SubpluginEnvironment.kt
+2 -5
View File
@@ -7,10 +7,7 @@ import org.gradle.api.tasks.compile.AbstractCompile
import org.gradle.api.tasks.compile.JavaCompile import org.gradle.api.tasks.compile.JavaCompile
import org.jetbrains.kotlin.gradle.dsl.KotlinCompile import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
import org.jetbrains.kotlin.gradle.logging.kotlinDebug import org.jetbrains.kotlin.gradle.logging.kotlinDebug
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget import org.jetbrains.kotlin.gradle.plugin.mpp.*
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.tasks.AbstractKotlinCompile import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
import org.jetbrains.kotlin.gradle.tasks.CompilerPluginOptions import org.jetbrains.kotlin.gradle.tasks.CompilerPluginOptions
import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
@@ -67,7 +64,7 @@ class SubpluginEnvironment(
project.logger.kotlinDebug { "Loading subplugin $pluginId" } project.logger.kotlinDebug { "Loading subplugin $pluginId" }
if (kotlinCompilation.platformType == KotlinPlatformType.native) { if (kotlinCompilation is AbstractKotlinNativeCompilation) {
subplugin.getPluginArtifactForNative()?.let { artifact -> subplugin.getPluginArtifactForNative()?.let { artifact ->
project.addMavenDependency(kotlinCompilation.pluginConfigurationName, artifact) project.addMavenDependency(kotlinCompilation.pluginConfigurationName, artifact)
} }