From 9ddb64288cb3b701e58c7eeae06c8652dd5826c1 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 2 Apr 2019 12:28:06 +0200 Subject: [PATCH] Avoid warning about scripting subplugin for MPP project Temporary solution, the subplugin should be adapted to the new MPP #KT-30742 fixed --- .../gradle/scripting/internal/ScriptingGradleSubplugin.kt | 6 +++++- 1 file changed, 5 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 5dd84924f0f..a5ec36df43e 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 @@ -17,6 +17,7 @@ import org.gradle.api.tasks.compile.AbstractCompile import org.jetbrains.kotlin.cli.common.messages.MessageRenderer import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile +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.scripting.ScriptingExtension @@ -69,7 +70,10 @@ class ScriptingGradleSubplugin : Plugin { project.tasks.withType(KotlinCompile::class.java, configureAction) } } else { - project.logger.warn("kotlin scripting plugin: applied to a non-JVM project $project, $MISCONFIGURATION_MESSAGE_SUFFIX") + // TODO: implement support for discovery in MPP project: use KotlinSourceSet directly and do not rely on java convevtion sourcesets + if (project.multiplatformExtensionOrNull == null) { + project.logger.warn("kotlin scripting plugin: applied to a non-JVM project $project, $MISCONFIGURATION_MESSAGE_SUFFIX") + } } } }