From bf5810a349a2a8ef83e2ce7f1c7fbe78e557137f Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Wed, 27 May 2020 12:07:03 +0300 Subject: [PATCH] [Gradle, JS] Fix text after proof read #KT-35641 fixed #KT-35611 fixed --- .../org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt | 7 +++---- .../kotlin/gradle/targets/js/KotlinJsDcePlugin.kt | 10 ++++------ 2 files changed, 7 insertions(+), 10 deletions(-) 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 a1e702abb40..3dd3b93e7e1 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 @@ -717,10 +717,9 @@ 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 - + The `kotlin2js` Gradle plugin has been deprecated. + Please use `org.jetbrains.kotlin.js` plugin instead. + For usage details, see https://kotlinlang.org/docs/reference/js-project-setup.html """.trimIndent() ) val target = KotlinWithJavaTarget(project, KotlinPlatformType.js, targetName) 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 a790a932cbc..5bc9bb34e70 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 @@ -22,12 +22,10 @@ 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 - + The `kotlin-dce-js` Gradle plugin has been deprecated. + DCE is now integrated in the `org.jetbrains.kotlin.js` plugin. + For plugin usage details, see https://kotlinlang.org/docs/reference/js-project-setup.html. + For more details about JavaScript DCE, see https://kotlinlang.org/docs/reference/javascript-dce.html """.trimIndent() ) val kotlinExtension =