From 92d9c5b150fc1c4c899d14f050205dcf6331d4e5 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Mon, 28 Mar 2022 22:46:39 +0200 Subject: [PATCH] Remove 'kotlin2js' Gradle plugin Plugin class is still left untouched as it is used by js platform old plugin. ^KT-48276 Fixed --- .../kotlin/gradle/testbase/projectSetupDefaults.kt | 4 ---- .../incrementalMultiproject/app/build-js.gradle | 2 +- .../incrementalMultiproject/lib/build-js.gradle | 2 +- .../testProject/kotlin2JsICProject/app/build.gradle | 2 +- .../testProject/kotlin2JsICProject/lib/build.gradle | 2 +- .../testProject/kotlin2JsInternalTest/build.gradle | 2 +- .../kotlin2JsIrDtsGeneration/build.gradle | 7 +++++-- .../testProject/kotlin2JsModuleKind/build.gradle | 7 +++++-- .../kotlin2JsNoOutputFileProject/build.gradle | 2 +- .../kotlin2JsProject/libraryProject/build.gradle | 2 +- .../kotlin2JsProject/mainProject/build.gradle | 2 +- .../build.gradle | 2 +- .../build.gradle | 2 +- .../kotlin2JsProjectWithTests/build.gradle | 2 +- .../kt-27059-pom-rewriting/js-app/build.gradle | 13 ++++++++++++- .../sample-old-style-app/app-js/build.gradle | 2 +- libraries/tools/kotlin-gradle-plugin/Module.md | 8 +++++--- .../gradle/plugin/KotlinMultiplatformPlugin.kt | 1 + .../jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt | 9 ++++----- .../kotlin/gradle/plugin/KotlinPluginWrapper.kt | 6 ++++++ .../kotlin/gradle/plugin/KotlinProperties.kt | 4 ---- .../kotlin/gradle/targets/js/KotlinJsPlugin.kt | 12 +----------- .../META-INF/gradle-plugins/kotlin2js.properties | 1 - 23 files changed, 51 insertions(+), 45 deletions(-) delete mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin2js.properties diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt index ab2c95258c5..129cd62ae22 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt @@ -50,9 +50,6 @@ internal val DEFAULT_GROOVY_SETTINGS_FILE = case "com.android.feature": useModule("com.android.tools.build:gradle:${'$'}android_tools_version") break - case "kotlin2js": - useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version") - break } } } @@ -103,7 +100,6 @@ internal val DEFAULT_KOTLIN_SETTINGS_FILE = "com.android.lint", "com.android.instantapp", "com.android.feature" -> useModule("com.android.tools.build:gradle:${'$'}android_tools_version") - "kotlin2js" -> useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version") } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/app/build-js.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/app/build-js.gradle index 62f6c9b017d..78b054b648e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/app/build-js.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/app/build-js.gradle @@ -1,4 +1,4 @@ -apply plugin: 'kotlin2js' +apply plugin: 'org.jetbrains.kotlin.platform.js' dependencies { implementation project(':lib') diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/lib/build-js.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/lib/build-js.gradle index aaf051c9255..1e4dcce2f15 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/lib/build-js.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/incrementalMultiproject/lib/build-js.gradle @@ -1,4 +1,4 @@ -apply plugin: 'kotlin2js' +apply plugin: 'org.jetbrains.kotlin.platform.js' dependencies { // do not remove until KT-25488 is fixed diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsICProject/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsICProject/app/build.gradle index 4fdfb3c4dd9..3c452784667 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsICProject/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsICProject/app/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'kotlin2js' +apply plugin: 'org.jetbrains.kotlin.platform.js' dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsICProject/lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsICProject/lib/build.gradle index 294a85a5996..2243fe0e68e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsICProject/lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsICProject/lib/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'kotlin2js' +apply plugin: 'org.jetbrains.kotlin.platform.js' dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsInternalTest/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsInternalTest/build.gradle index 6ca04058e5e..f638bb54c7a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsInternalTest/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsInternalTest/build.gradle @@ -8,7 +8,7 @@ buildscript { } } -apply plugin: 'kotlin2js' +apply plugin: 'org.jetbrains.kotlin.platform.js' repositories { mavenLocal() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsIrDtsGeneration/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsIrDtsGeneration/build.gradle index 1676dcaebbc..fcac04819cf 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsIrDtsGeneration/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsIrDtsGeneration/build.gradle @@ -9,8 +9,11 @@ buildscript { } } -apply plugin: "kotlin2js" -apply plugin: 'java' +plugins { + id 'java' +} + +apply plugin: 'org.jetbrains.kotlin.platform.js' def outDir = "${buildDir}/kotlin2js/main/" compileKotlin2Js.kotlinOptions.moduleKind = "plain" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsModuleKind/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsModuleKind/build.gradle index 5f0c7ad58c2..856e96c9c1f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsModuleKind/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsModuleKind/build.gradle @@ -9,8 +9,11 @@ buildscript { } } -apply plugin: "kotlin2js" -apply plugin: 'java' +plugins { + id 'java' +} + +apply plugin: 'org.jetbrains.kotlin.platform.js' def outDir = "${buildDir}/kotlin2js/main/" compileKotlin2Js.kotlinOptions.moduleKind = "amd" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle index 09e5cf9589e..d77cabe4e15 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsNoOutputFileProject/build.gradle @@ -9,7 +9,7 @@ buildscript { } } -apply plugin: "kotlin2js" +apply plugin: "org.jetbrains.kotlin.platform.js" repositories { mavenLocal() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle index 9a41de983c2..9f21cccf4ac 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/libraryProject/build.gradle @@ -8,7 +8,7 @@ buildscript { } } -apply plugin: 'kotlin2js' +apply plugin: 'org.jetbrains.kotlin.platform.js' repositories { mavenLocal() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle index af2f511691a..16f07014e38 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProject/mainProject/build.gradle @@ -8,7 +8,7 @@ buildscript { } } -apply plugin: "kotlin2js" +apply plugin: 'org.jetbrains.kotlin.platform.js' repositories { mavenLocal() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithCustomSourceset/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithCustomSourceset/build.gradle index ebddcecaa34..f8c09c062b9 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithCustomSourceset/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithCustomSourceset/build.gradle @@ -8,7 +8,7 @@ buildscript { } } -apply plugin: 'kotlin2js' +apply plugin: 'org.jetbrains.kotlin.platform.js' repositories { mavenLocal() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithSourceMapInline/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithSourceMapInline/build.gradle index f051a873ec8..2e48b0dcbe8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithSourceMapInline/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithSourceMapInline/build.gradle @@ -9,7 +9,7 @@ buildscript { } allprojects { - apply plugin: 'kotlin2js' + plugins.apply('org.jetbrains.kotlin.platform.js') repositories { mavenLocal() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithTests/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithTests/build.gradle index 3f579c0d8e3..f36e0587acb 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithTests/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithTests/build.gradle @@ -8,7 +8,7 @@ buildscript { } } -apply plugin: 'kotlin2js' +apply plugin: 'org.jetbrains.kotlin.platform.js' repositories { mavenLocal() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-27059-pom-rewriting/js-app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-27059-pom-rewriting/js-app/build.gradle index 8eed59f66a3..7197057651a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-27059-pom-rewriting/js-app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-27059-pom-rewriting/js-app/build.gradle @@ -1,8 +1,19 @@ +buildscript { + repositories { + mavenLocal() + mavenCentral() + } + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + plugins { - id "kotlin2js" id "maven-publish" } +apply plugin: 'org.jetbrains.kotlin.platform.js' + group = "com.example" version = "1.0" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-js/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-js/build.gradle index 634a54d5525..a6dfc09bf5d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-js/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-old-style-app/app-js/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'kotlin2js' +apply plugin: 'org.jetbrains.kotlin.platform.js' dependencies { implementation 'com.example:sample-lib:1.0' diff --git a/libraries/tools/kotlin-gradle-plugin/Module.md b/libraries/tools/kotlin-gradle-plugin/Module.md index 468cb1e2caa..862c3ec092d 100644 --- a/libraries/tools/kotlin-gradle-plugin/Module.md +++ b/libraries/tools/kotlin-gradle-plugin/Module.md @@ -87,12 +87,14 @@ afterEvaluate { // compileDebugKotlin.noStdlib == false ``` -### kotlin2js +### Kotlin/JS How to apply: ``` -apply plugin: 'kotlin2js' +plugins { + id 'org.jetbrains.kotlin.js' +} ``` Tasks: @@ -106,7 +108,7 @@ Tasks: Each [KotlinJsCompile] task provides `kotlinOptions` ([KotlinJsOptions]) extension: ``` -compileKotlin2Js { +compileKotlinJs { kotlinOptions { noStdlib = true } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformPlugin.kt index 5a42cd404ca..fff6e551681 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformPlugin.kt @@ -279,6 +279,7 @@ open class KotlinPlatformJvmPlugin : KotlinPlatformImplementationPluginBase("jvm open class KotlinPlatformJsPlugin : KotlinPlatformImplementationPluginBase("js") { override fun apply(project: Project) { + @Suppress("DEPRECATION_ERROR") project.applyPlugin() super.apply(project) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index 25adc15e283..80d5859d07c 100755 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -39,7 +39,6 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.isMainCompilationData import org.jetbrains.kotlin.gradle.scripting.internal.ScriptingGradleSubplugin import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsBinaryMode import org.jetbrains.kotlin.gradle.targets.js.ir.* -import org.jetbrains.kotlin.gradle.targets.js.jsPluginDeprecationMessage import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget import org.jetbrains.kotlin.gradle.tasks.* import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -693,13 +692,16 @@ internal open class KotlinCommonPlugin( } } +@Deprecated( + message = "Should be removed with Js platform plugin", + level = DeprecationLevel.ERROR +) internal open class Kotlin2JsPlugin( registry: ToolingModelBuilderRegistry ) : AbstractKotlinPlugin(KotlinTasksProvider(), registry) { companion object { private const val targetName = "2Js" - internal const val NOWARN_2JS_FLAG = "kotlin.2js.nowarn" } override fun buildSourceSetProcessor( @@ -709,9 +711,6 @@ internal open class Kotlin2JsPlugin( Kotlin2JsSourceSetProcessor(tasksProvider, compilation) override fun apply(project: Project) { - 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/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt index 4eaf72a891c..a5455708d47 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt @@ -199,9 +199,15 @@ open class KotlinAndroidPluginWrapper @Inject constructor( get() = KotlinAndroidProjectExtension::class } +@Deprecated( + message = "Should be removed with JS platform plugin", + level = DeprecationLevel.ERROR +) open class Kotlin2JsPluginWrapper @Inject constructor( protected val registry: ToolingModelBuilderRegistry ) : KotlinBasePluginWrapper() { + + @Suppress("DEPRECATION_ERROR") override fun getPlugin(project: Project): Plugin = Kotlin2JsPlugin(registry) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt index be44099f25f..adff6a254e8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt @@ -10,7 +10,6 @@ import org.jetbrains.kotlin.cli.common.CompilerSystemProperties import org.jetbrains.kotlin.cli.common.toBooleanLenient import org.jetbrains.kotlin.gradle.dsl.NativeCacheKind import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessageOutputStreamHandler.Companion.IGNORE_TCSM_OVERFLOW -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.PropertiesProvider.PropertyNames.KOTLIN_ABI_SNAPSHOT import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.PropertyNames.KOTLIN_MPP_ENABLE_CINTEROP_COMMONIZATION @@ -418,9 +417,6 @@ internal class PropertiesProvider private constructor(private val project: Proje ?.report(StringMetrics.JS_GENERATE_EXECUTABLE_DEFAULT, it.toString()) } - val noWarn2JsPlugin: Boolean - get() = booleanProperty(NOWARN_2JS_FLAG) ?: false - val stdlibDefaultDependency: Boolean get() = booleanProperty(KOTLIN_STDLIB_DEFAULT_DEPENDENCY) ?: true diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt index 8848f292cda..15a7dd33d89 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsPlugin.kt @@ -24,10 +24,6 @@ open class KotlinJsPlugin( ) : Plugin { override fun apply(project: Project) { - project.pluginManager.withPlugin("org.jetbrains.kotlin.frontend") { - project.logger.warn(jsPluginDeprecationMessage("org.jetbrains.kotlin.frontend")) - } - project.setupGeneralKotlinExtensionParameters() // TODO get rid of this plugin, too? Use the 'base' plugin instead? @@ -47,6 +43,7 @@ open class KotlinJsPlugin( } project.runProjectConfigurationHealthCheckWhenEvaluated { + @Suppress("DEPRECATION") if (kotlinExtension._target == null) { project.logger.warn( """ @@ -91,10 +88,3 @@ open class KotlinJsPlugin( kotlinExtension.sourceSets.maybeCreate(TEST_COMPILATION_NAME) } } - -internal fun jsPluginDeprecationMessage(id: String): String = - """ - The `$id` Gradle plugin has been deprecated. - Please use `org.jetbrains.kotlin.js` plugin instead `kotlin2js` and `org.jetbrains.kotlin.frontend` - For usage details, see https://kotlinlang.org/docs/reference/js-project-setup.html - """.trimIndent() diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin2js.properties b/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin2js.properties deleted file mode 100644 index e599d2e654b..00000000000 --- a/libraries/tools/kotlin-gradle-plugin/src/common/resources/META-INF/gradle-plugins/kotlin2js.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.jetbrains.kotlin.gradle.plugin.Kotlin2JsPluginWrapper \ No newline at end of file