From 85e5f8a736ef8cf109945b91a01a2e6976e6b276 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 26 May 2020 18:14:14 +0300 Subject: [PATCH] [Gradle, JS] Deprecation of kotlin2js and kotlin-dce-js plugins #KT-35641 fixed #KT-35611 fixed --- .../jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt | 8 ++++++++ .../kotlin/gradle/targets/js/KotlinJsDcePlugin.kt | 12 +++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) 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 401635f072d..a1e702abb40 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 @@ -715,6 +715,14 @@ internal open class Kotlin2JsPlugin( ) override fun apply(project: Project) { + project.logger.warn( + """ + Please pay attention: + `kotlin2js` plugin is deprecated. + Please follow https://kotlinlang.org/docs/reference/js-project-setup.html to set up project with `org.jetbrains.kotlin.js` plugin + + """.trimIndent() + ) val target = KotlinWithJavaTarget(project, KotlinPlatformType.js, targetName) (project.kotlinExtension as Kotlin2JsProjectExtension).target = target diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsDcePlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsDcePlugin.kt index cf6a9002554..a790a932cbc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsDcePlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsDcePlugin.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -20,6 +20,16 @@ import java.io.File class KotlinJsDcePlugin : Plugin { override fun apply(project: Project) { + project.logger.warn( + """ + Please pay attention: + `kotlin-dce-js` plugin is deprecated. + DCE is automatically integrated in `org.jetbrains.kotlin.js` plugin + Please follow https://kotlinlang.org/docs/reference/js-project-setup.html to set up project with `org.jetbrains.kotlin.js` plugin. + Additional information about JavaScript DCE you can fin here - https://kotlinlang.org/docs/reference/javascript-dce.html + + """.trimIndent() + ) val kotlinExtension = project.multiplatformExtensionOrNull ?: project.extensions.getByName("kotlin") as? KotlinSingleTargetExtension