diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index 5fd7a790fe5..03b769e218a 100755 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -6,7 +6,9 @@ package org.jetbrains.kotlin.gradle.plugin import com.android.build.gradle.* -import com.android.build.gradle.api.* +import com.android.build.gradle.api.AndroidSourceSet +import com.android.build.gradle.api.BaseVariant +import com.android.build.gradle.api.SourceKind import org.gradle.api.* import org.gradle.api.artifacts.maven.Conf2ScopeMappingContainer import org.gradle.api.artifacts.maven.MavenResolver @@ -29,7 +31,7 @@ import org.gradle.api.tasks.compile.AbstractCompile import org.gradle.jvm.tasks.Jar import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry import org.jetbrains.kotlin.gradle.dsl.* -import org.jetbrains.kotlin.gradle.internal.* +import org.jetbrains.kotlin.gradle.internal.Kapt3GradleSubplugin import org.jetbrains.kotlin.gradle.internal.checkAndroidAnnotationProcessorDependencyUsage import org.jetbrains.kotlin.gradle.internal.customizeKotlinDependencies import org.jetbrains.kotlin.gradle.logging.kotlinDebug @@ -655,6 +657,7 @@ internal open class Kotlin2JsPlugin( companion object { private const val targetName = "2Js" + internal const val NOWARN_2JS_FLAG = "kotlin.2js.nowarn" } override fun buildSourceSetProcessor( @@ -667,7 +670,9 @@ internal open class Kotlin2JsPlugin( ) override fun apply(project: Project) { - project.logger.warn(jsPluginDeprecationMessage("kotlin2js")) + if (!PropertiesProvider(project).noWarn2JsPlugin) { + project.logger.warn(jsPluginDeprecationMessage("kotlin2js")) + } val target = KotlinWithJavaTarget(project, KotlinPlatformType.js, targetName, { KotlinJsOptionsImpl() }) (project.kotlinExtension as Kotlin2JsProjectExtension).target = target diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt index 809cc759ecf..c412a651f74 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.gradle.plugin import org.gradle.api.Project import org.jetbrains.kotlin.gradle.dsl.Coroutines import org.jetbrains.kotlin.gradle.dsl.NativeCacheKind +import org.jetbrains.kotlin.gradle.plugin.Kotlin2JsPlugin.Companion.NOWARN_2JS_FLAG import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType.Companion.jsCompilerProperty import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMultiplatformPlugin import org.jetbrains.kotlin.gradle.targets.native.DisabledNativeTargetsReporter @@ -212,6 +213,9 @@ internal class PropertiesProvider private constructor(private val project: Proje val jsGenerateExecutableDefault: Boolean get() = booleanProperty("kotlin.js.generate.executable.default") ?: true + val noWarn2JsPlugin: Boolean + get() = booleanProperty(NOWARN_2JS_FLAG) ?: false + val stdlibDefaultDependency: Boolean get() = booleanProperty("kotlin.stdlib.default.dependency") ?: true