From 0b4dfd58fc06a6cea8771ac557b66b27128177ab Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Mon, 30 Aug 2021 14:20:42 +0300 Subject: [PATCH] [Gradle] Don't apply scripting gradle subplugin to Native compilations It doesn't support Native anyway, but applying it blocks using the generic compiler plugin artifact for Native. --- .../gradle/scripting/internal/ScriptingGradleSubplugin.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt index 5154dd067f6..79948e58558 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions import org.jetbrains.kotlin.gradle.dsl.multiplatformExtensionOrNull import org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask import org.jetbrains.kotlin.gradle.plugin.* +import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinNativeCompilation import org.jetbrains.kotlin.gradle.scripting.ScriptingExtension import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.scripting.compiler.plugin.impl.reporter @@ -223,7 +224,7 @@ class ScriptingKotlinGradleSubplugin : val LEGACY_SCRIPT_RESOLVER_ENVIRONMENT_OPTION = "script-resolver-environment" } - override fun isApplicable(kotlinCompilation: KotlinCompilation<*>): Boolean = true + override fun isApplicable(kotlinCompilation: KotlinCompilation<*>): Boolean = kotlinCompilation !is AbstractKotlinNativeCompilation override fun applyToCompilation( kotlinCompilation: KotlinCompilation<*>