From c6e4858bc90d3b5b58c2f479de4dc5b696915494 Mon Sep 17 00:00:00 2001 From: Artem Kobzar Date: Tue, 28 Mar 2023 12:47:04 +0000 Subject: [PATCH] [K/JS] Remove the ability to run Legacy JS backend from the Gradle Plugin --- libraries/kotlin.test/js/build.gradle | 3 ++- libraries/kotlin.test/js/it/build.gradle | 5 ++++- libraries/stdlib/js-v1/build.gradle | 5 +++++ .../jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt | 1 + .../sample-app-gradle-kotlin-dsl/build.gradle.kts | 6 +++++- .../both-js-lib-and-app/sample-app/build.gradle | 4 ++++ .../sample-lib-gradle-kotlin-dsl/build.gradle.kts | 6 +++++- .../both-js-lib-and-app/sample-lib/build.gradle | 6 +++++- .../differentClassloaders/js-app/build.gradle | 4 ++++ .../differentClassloaders/mpp-lib/build.gradle | 6 +++++- .../hierarchical-mpp-js-test/build.gradle.kts | 6 +++++- .../my-app/build.gradle.kts | 4 ++++ .../my-lib-bar/build.gradle.kts | 6 +++++- .../my-lib-foo/build.gradle.kts | 6 +++++- .../third-party-lib/build.gradle.kts | 6 +++++- .../my-app/build.gradle.kts | 4 ++++ .../my-lib-foo/build.gradle.kts | 4 ++++ .../my-lib-foo/build.gradle.kts | 6 +++++- .../third-party-lib/build.gradle.kts | 6 +++++- .../testProject/instantExecutionToJs/build.gradle | 4 ++++ .../js-dynamic-webpack-config-d/build.gradle.kts | 5 ++++- .../kotlin-js-both-mode-with-tests/build.gradle.kts | 6 +++++- .../kotlin-js-browser-project/app/build.gradle.kts | 9 ++++++++- .../kotlin-js-browser-project/base/build.gradle.kts | 9 ++++++++- .../kotlin-js-browser-project/lib/build.gradle.kts | 9 ++++++++- .../app/build.gradle.kts | 3 +++ .../lib/build.gradle.kts | 5 ++++- .../kotlin-js-nodejs-custom-node-module/build.gradle | 6 +++++- .../testProject/kotlin-js-nodejs-project/build.gradle | 9 ++++++++- .../kotlin-js-plugin-project/build.gradle.kts | 6 +++++- .../kotlin-js-test-webpack-config/build.gradle.kts | 6 +++++- .../testProject/kotlin2JsICProject/app/build.gradle | 6 +++++- .../testProject/kotlin2JsICProject/lib/build.gradle | 6 +++++- .../testProject/kotlin2JsInternalTest/build.gradle | 6 +++++- .../testProject/kotlin2JsModuleKind/build.gradle | 4 ++++ .../kotlin2JsProjectWithSourceMap/build.gradle.kts | 9 ++++++++- .../testProject/kotlin2JsProjectWithTests/build.gradle | 2 ++ .../kt-27059-pom-rewriting/js-app/build.gradle | 4 ++++ .../kt-27059-pom-rewriting/mpp-lib/build.gradle | 6 +++++- .../testProject/new-mpp-android/app/build.gradle | 4 ++++ .../testProject/new-mpp-android/lib/build.gradle | 4 ++++ .../new-mpp-js-dce/libraryProject/build.gradle | 5 +++++ .../testProject/new-mpp-js-dce/mainProject/build.gradle | 4 ++++ .../testProject/new-mpp-js-tests/build.gradle.kts | 6 +++++- .../new-mpp-lib-and-app/sample-app/build.gradle | 4 ++++ .../sample-lib-gradle-kotlin-dsl/build.gradle.kts | 6 +++++- .../new-mpp-lib-and-app/sample-lib/build.gradle | 6 +++++- .../testProject/npm-dependencies/build.gradle.kts | 6 +++++- .../testProject/simple-js-executable/build.gradle.kts | 6 +++++- .../testProject/simple-js-library/build.gradle.kts | 4 ++++ .../jetbrains/kotlin/gradle/tasks/Kotlin2JsCompile.kt | 4 ---- repo/gradle-settings-conventions/gradle.properties | 2 +- .../main/kotlin/kotlin-daemon-config.settings.gradle.kts | 7 +------ 53 files changed, 239 insertions(+), 43 deletions(-) diff --git a/libraries/kotlin.test/js/build.gradle b/libraries/kotlin.test/js/build.gradle index 7105d9e8358..ba71c37b40e 100644 --- a/libraries/kotlin.test/js/build.gradle +++ b/libraries/kotlin.test/js/build.gradle @@ -18,6 +18,7 @@ compileKotlin2Js { "-Xallow-kotlin-package", "-opt-in=kotlin.contracts.ExperimentalContracts", "-opt-in=kotlin.RequiresOptIn", + "-Xforce-deprecated-legacy-compiler-usage" ] kotlinOptions { moduleKind = "umd" @@ -29,10 +30,10 @@ compileKotlin2Js { } compileTestKotlin2Js { - kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"] kotlinOptions { metaInfo = false moduleKind = "umd" + freeCompilerArgs = ["-Xallow-kotlin-package", "-Xforce-deprecated-legacy-compiler-usage"] } } diff --git a/libraries/kotlin.test/js/it/build.gradle b/libraries/kotlin.test/js/it/build.gradle index be57874a0b0..fee788a1999 100644 --- a/libraries/kotlin.test/js/it/build.gradle +++ b/libraries/kotlin.test/js/it/build.gradle @@ -28,7 +28,10 @@ buildDir = "$projectDir/build" ["compileKotlin2Js", "compileTestKotlin2Js"].forEach { tasks.named(it).configure { - kotlinOptions.moduleKind = "commonjs" + kotlinOptions { + moduleKind = "commonjs" + freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" + } } } diff --git a/libraries/stdlib/js-v1/build.gradle b/libraries/stdlib/js-v1/build.gradle index 5e1498a229b..cab63241866 100644 --- a/libraries/stdlib/js-v1/build.gradle +++ b/libraries/stdlib/js-v1/build.gradle @@ -135,6 +135,7 @@ compileKotlin2Js { "-opt-in=kotlin.ExperimentalMultiplatform", "-opt-in=kotlin.contracts.ExperimentalContracts", "-XXLanguage:+RangeUntilOperator", + "-Xforce-deprecated-legacy-compiler-usage" ] } } @@ -364,3 +365,7 @@ task runMocha(type: NodeTask, dependsOn: [testClasses, installMocha, ':kotlin-te } test.dependsOn runMocha + +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt index 1f9544bd939..ff99d32865c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt @@ -492,6 +492,7 @@ class Kotlin2JsGradlePluginIT : AbstractKotlin2JsGradlePluginIT(false) { |afterEvaluate { | tasks.named('compileKotlinJs') { | kotlinOptions.outputFile = "${'$'}{project.projectDir}/out/out.js" + | kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" | } |} | diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app-gradle-kotlin-dsl/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app-gradle-kotlin-dsl/build.gradle.kts index 5778e491118..914eff1ee94 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app-gradle-kotlin-dsl/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app-gradle-kotlin-dsl/build.gradle.kts @@ -25,4 +25,8 @@ kotlin { } } } -} \ No newline at end of file +} + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app/build.gradle index fc9abf9282f..01255839fd4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-app/build.gradle @@ -32,4 +32,8 @@ kotlin { } } } +} + +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib-gradle-kotlin-dsl/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib-gradle-kotlin-dsl/build.gradle.kts index 41458b8a6d0..cc2ebaded5b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib-gradle-kotlin-dsl/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib-gradle-kotlin-dsl/build.gradle.kts @@ -40,4 +40,8 @@ publishing { repositories { maven { setUrl("file://${projectDir.absolutePath.replace('\\', '/')}/repo") } } -} \ No newline at end of file +} + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib/build.gradle index 14ede40215a..d84ba47b47a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/both-js-lib-and-app/sample-lib/build.gradle @@ -53,4 +53,8 @@ publishing { repositories { maven { url "file://${projectDir.absolutePath.replace('\\', '/')}/repo" } } -} \ No newline at end of file +} + +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/differentClassloaders/js-app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/differentClassloaders/js-app/build.gradle index 088a2dc8fed..55554834cc8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/differentClassloaders/js-app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/differentClassloaders/js-app/build.gradle @@ -28,3 +28,7 @@ if (project.findProperty("mppProjectDependency") == "true") { } } + +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/differentClassloaders/mpp-lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/differentClassloaders/mpp-lib/build.gradle index 686876fbf8f..4bcd8feca16 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/differentClassloaders/mpp-lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/differentClassloaders/mpp-lib/build.gradle @@ -39,4 +39,8 @@ publishing { repositories { maven { setUrl("${rootProject.buildDir}/repo") } } -} \ No newline at end of file +} + +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-js-test/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-js-test/build.gradle.kts index 7bd9da76e70..dafd7bf32be 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-js-test/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-js-test/build.gradle.kts @@ -57,4 +57,8 @@ kotlin { } } } -} \ No newline at end of file +} + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-app/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-app/build.gradle.kts index 9f2ad88fc90..f27675c407c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-app/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-app/build.gradle.kts @@ -87,3 +87,7 @@ kotlin { } } } + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-lib-bar/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-lib-bar/build.gradle.kts index 4fb376f3b7c..e030e422d74 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-lib-bar/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-lib-bar/build.gradle.kts @@ -93,4 +93,8 @@ publishing { repositories { maven("") } -} \ No newline at end of file +} + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-lib-foo/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-lib-foo/build.gradle.kts index 5bdbc563bde..234497b0ba4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-lib-foo/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/my-lib-foo/build.gradle.kts @@ -105,4 +105,8 @@ publishing { repositories { maven("") } -} \ No newline at end of file +} + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/third-party-lib/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/third-party-lib/build.gradle.kts index 1dbee8d8c6f..64ba7116a08 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/third-party-lib/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-published-modules/third-party-lib/build.gradle.kts @@ -54,4 +54,8 @@ publishing { repositories { maven("") } -} \ No newline at end of file +} + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-project-dependency/my-app/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-project-dependency/my-app/build.gradle.kts index 11530fc5005..0ae4a7090a8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-project-dependency/my-app/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-project-dependency/my-app/build.gradle.kts @@ -41,3 +41,7 @@ kotlin { } } } + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-project-dependency/my-lib-foo/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-project-dependency/my-lib-foo/build.gradle.kts index 7b307cd3fa1..a96e67faa2a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-project-dependency/my-lib-foo/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-project-dependency/my-lib-foo/build.gradle.kts @@ -27,3 +27,7 @@ kotlin { } } } + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/build.gradle.kts index ba353e0c943..134b7d8cfc1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/my-lib-foo/build.gradle.kts @@ -35,4 +35,8 @@ publishing { repositories { maven("") } -} \ No newline at end of file +} + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/third-party-lib/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/third-party-lib/build.gradle.kts index b456ada095b..0aebebf7c8e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/third-party-lib/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/hierarchical-mpp-with-js-published-modules/third-party-lib/build.gradle.kts @@ -37,4 +37,8 @@ publishing { from(components["kotlin"]) } } -} \ No newline at end of file +} + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/instantExecutionToJs/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/instantExecutionToJs/build.gradle index 4d39a618226..df87787d5b8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/instantExecutionToJs/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/instantExecutionToJs/build.gradle @@ -26,6 +26,8 @@ tasks.named("compileKotlinJs", Kotlin2JsCompile) { it.kotlinOptions.outputFile = "${buildDir}/kotlin2js/main/module.js" if (jsUseIrBackend) { it.kotlinOptions.freeCompilerArgs += ["-Xir-produce-klib-dir", "-Xir-only"] + } else { + it.kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" } } @@ -33,5 +35,7 @@ tasks.named("compileTestKotlinJs", Kotlin2JsCompile) { it.kotlinOptions.outputFile = "${buildDir}/kotlin2js/test/module-tests.js" if (jsUseIrBackend) { it.kotlinOptions.freeCompilerArgs += ["-Xir-produce-js"] + } else { + it.kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-dynamic-webpack-config-d/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-dynamic-webpack-config-d/build.gradle.kts index fb790f69fe0..5fd88fe1440 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-dynamic-webpack-config-d/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-dynamic-webpack-config-d/build.gradle.kts @@ -33,4 +33,7 @@ tasks.named("browserTest") { tasks.withType { dependsOn("foo") -} \ No newline at end of file +} +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/build.gradle.kts index 7a0372095b1..85393a3e71f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-both-mode-with-tests/build.gradle.kts @@ -16,4 +16,8 @@ kotlin { nodejs { } } -} \ No newline at end of file +} + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/app/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/app/build.gradle.kts index e41c9e39f3d..6c16784eaaf 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/app/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/app/build.gradle.kts @@ -67,4 +67,11 @@ rootProject.plugins.withType("compileKotlinJs") { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} +tasks.named("compileTestKotlinJs") { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/base/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/base/build.gradle.kts index 57f5987c814..d19a9caaad0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/base/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/base/build.gradle.kts @@ -17,4 +17,11 @@ kotlin { browser { } } -} \ No newline at end of file +} + +tasks.named("compileKotlinJsLegacy") { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} +tasks.named("compileTestKotlinJsLegacy") { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/lib/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/lib/build.gradle.kts index 13ff08e22c3..9a00c15952f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/lib/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-browser-project/lib/build.gradle.kts @@ -13,4 +13,11 @@ kotlin { browser { } } -} \ No newline at end of file +} + +tasks.named("compileKotlinJs") { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} +tasks.named("compileTestKotlinJs") { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-ir-ic-multiple-artifacts/app/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-ir-ic-multiple-artifacts/app/build.gradle.kts index 1e2be5da945..0ae96538b36 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-ir-ic-multiple-artifacts/app/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-ir-ic-multiple-artifacts/app/build.gradle.kts @@ -28,3 +28,6 @@ kotlin { } } } +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-ir-ic-multiple-artifacts/lib/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-ir-ic-multiple-artifacts/lib/build.gradle.kts index 6a42bd1cd12..f5df9e771f2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-ir-ic-multiple-artifacts/lib/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-ir-ic-multiple-artifacts/lib/build.gradle.kts @@ -35,4 +35,7 @@ kotlin { } } } -} \ No newline at end of file +} +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-custom-node-module/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-custom-node-module/build.gradle index c96daaf9db0..32916ee88e2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-custom-node-module/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-custom-node-module/build.gradle @@ -24,4 +24,8 @@ kotlin { } } } -} \ No newline at end of file +} + +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/build.gradle index a5ca83678fd..38651cc19f3 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-nodejs-project/build.gradle @@ -19,4 +19,11 @@ kotlin { nodejs { } } -} \ No newline at end of file +} + +tasks.named("compileKotlinJs", org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} +tasks.named("compileTestKotlinJs", org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-plugin-project/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-plugin-project/build.gradle.kts index 3a0978681a0..9aaf962f5cf 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-plugin-project/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-plugin-project/build.gradle.kts @@ -56,4 +56,8 @@ publishing { repositories { maven("$buildDir/repo") } -} \ No newline at end of file +} + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-test-webpack-config/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-test-webpack-config/build.gradle.kts index fb69510384c..32a499080e8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-test-webpack-config/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-test-webpack-config/build.gradle.kts @@ -64,4 +64,8 @@ kotlin { } } } -} \ No newline at end of file +} + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} 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 ba7965e4037..f4ca0b5eb78 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 @@ -19,4 +19,8 @@ kotlin { } binaries.executable() } -} \ No newline at end of file +} + +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} 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 57cc932058b..ba741a03495 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 @@ -17,4 +17,8 @@ kotlin { } } -} \ No newline at end of file +} + +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} 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 f5b4f8f130f..32d56a0fbe2 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 @@ -25,4 +25,8 @@ kotlin { } } -} \ No newline at end of file +} + +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} 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 a4e113b43e1..d9a86a73ec4 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 @@ -61,4 +61,8 @@ build.doLast { } } +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} + runRhino.dependsOn build \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithSourceMap/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithSourceMap/build.gradle.kts index 1b2c665245f..bf897692e74 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithSourceMap/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithSourceMap/build.gradle.kts @@ -35,6 +35,10 @@ project("lib") { browser() } } + + tasks.withType() { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" + } } project("app") { @@ -49,6 +53,9 @@ project("app") { } tasks.withType() { - kotlinOptions.sourceMap = true + kotlinOptions { + sourceMap = true + freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" + } } } 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 3e34e3a4b30..71e1d712fb6 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 @@ -36,4 +36,6 @@ if (project.findProperty("kotlin.js.useIrBackend")?.toBoolean() == true) { compileKotlin2Js.kotlinOptions.outputFile = "${buildDir}/kotlin2js/main/" } else { compileKotlin2Js.kotlinOptions.outputFile = "${buildDir}/kotlin2js/main/module.js" + compileKotlin2Js.kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" + compileTestKotlin2Js.kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" } \ No newline at end of file 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 cc28bc875aa..81a8458bdb0 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 @@ -43,3 +43,7 @@ publishing { maven { setUrl("${rootProject.buildDir}/repo") } } } + +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-27059-pom-rewriting/mpp-lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-27059-pom-rewriting/mpp-lib/build.gradle index 686876fbf8f..4bcd8feca16 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-27059-pom-rewriting/mpp-lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-27059-pom-rewriting/mpp-lib/build.gradle @@ -39,4 +39,8 @@ publishing { repositories { maven { setUrl("${rootProject.buildDir}/repo") } } -} \ No newline at end of file +} + +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle index 7a956ced5c8..a4766a0990a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle @@ -75,3 +75,7 @@ task printCompilerPluginOptions { } } } + +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/lib/build.gradle index f6f37d534c3..de85b6dcda6 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/lib/build.gradle @@ -93,3 +93,7 @@ publishing { } } } + +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/libraryProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/libraryProject/build.gradle index 0fce16ee9ba..b1f21f34636 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/libraryProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/libraryProject/build.gradle @@ -33,3 +33,8 @@ nodeJsJar { } nodeJsJar.dependsOn(compileKotlinNodeJs) + +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} + diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/mainProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/mainProject/build.gradle index a19db0bf1c0..c5a17ced64a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/mainProject/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-dce/mainProject/build.gradle @@ -42,6 +42,10 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinJsDce).configureEach { destinationDirectory = project.layout.buildDirectory.dir("kotlin-js-min") } +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} + task runRhino(type: JavaExec) { dependsOn(tasks.named('processDceBrowserKotlinJs')) classpath = kotlin.targets.browser.compilations.main.runtimeDependencyFiles diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-tests/build.gradle.kts index 214137a275e..b47a3c4d6c8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-js-tests/build.gradle.kts @@ -23,4 +23,8 @@ kotlin { js("server") js("client") -} \ No newline at end of file +} + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/build.gradle index f72cd8b6045..149fd9d4cd1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-app/build.gradle @@ -92,3 +92,7 @@ task resolveRuntimeDependencies(type: DefaultTask) { configurations[configName].resolve() } } + +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/build.gradle.kts index 61596812abd..92bda9587c0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib-gradle-kotlin-dsl/build.gradle.kts @@ -64,4 +64,8 @@ afterEvaluate { tasks["assemble"].dependsOn(compileKotlinTask) } } -} \ No newline at end of file +} + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/build.gradle index 8eeddf8e051..3c1ad07e981 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-lib-and-app/sample-lib/build.gradle @@ -120,4 +120,8 @@ afterEvaluate { assemble.dependsOn compileKotlinTask } } -} \ No newline at end of file +} + +tasks.withType(org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile) { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/npm-dependencies/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/npm-dependencies/build.gradle.kts index c2f197e055c..8b490b1ff24 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/npm-dependencies/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/npm-dependencies/build.gradle.kts @@ -36,4 +36,8 @@ kotlin.sourceSets { kotlin.target { nodejs() -} \ No newline at end of file +} + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simple-js-executable/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simple-js-executable/build.gradle.kts index 48f94501580..49162dc5ed1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simple-js-executable/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simple-js-executable/build.gradle.kts @@ -15,4 +15,8 @@ kotlin { binaries.executable() nodejs() } -} \ No newline at end of file +} + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simple-js-library/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simple-js-library/build.gradle.kts index 479fe62e535..26bf7facb4c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simple-js-library/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/simple-js-library/build.gradle.kts @@ -24,3 +24,7 @@ kotlin { } } } + +tasks.withType { + kotlinOptions.freeCompilerArgs += "-Xforce-deprecated-legacy-compiler-usage" +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Kotlin2JsCompile.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Kotlin2JsCompile.kt index 0921584091a..4ba562e23c1 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Kotlin2JsCompile.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Kotlin2JsCompile.kt @@ -274,10 +274,6 @@ abstract class Kotlin2JsCompile @Inject constructor( args.friendModules = friendDependencies.files.joinToString(File.pathSeparator) { it.absolutePath } - if (!isIrBackendEnabled()) { - args.forceDeprecatedLegacyCompilerUsage = true - } - logger.kotlinDebug("compiling with args ${ArgumentUtils.convertArgumentsToStringList(args)}") val gradlePrintingMessageCollector = GradlePrintingMessageCollector(logger, args.allWarningsAsErrors) diff --git a/repo/gradle-settings-conventions/gradle.properties b/repo/gradle-settings-conventions/gradle.properties index c8206c92d36..d135cea039a 100644 --- a/repo/gradle-settings-conventions/gradle.properties +++ b/repo/gradle-settings-conventions/gradle.properties @@ -2,4 +2,4 @@ kotlin.build.gradlePlugin.version=0.0.39 kotlin.options.suppressFreeCompilerArgsModificationWarning=true cacheRedirectorEnabled=true # Should be in sync with ":kotlin-daemon-config" project convention script configuration -kotlin.daemon.jvmargs=-Xmx3g -Dkotlin.js.compiler.legacy.force_enabled=true \ No newline at end of file +kotlin.daemon.jvmargs=-Xmx3g \ No newline at end of file diff --git a/repo/gradle-settings-conventions/kotlin-daemon-config/src/main/kotlin/kotlin-daemon-config.settings.gradle.kts b/repo/gradle-settings-conventions/kotlin-daemon-config/src/main/kotlin/kotlin-daemon-config.settings.gradle.kts index 707b909bb3b..acead2333dc 100644 --- a/repo/gradle-settings-conventions/kotlin-daemon-config/src/main/kotlin/kotlin-daemon-config.settings.gradle.kts +++ b/repo/gradle-settings-conventions/kotlin-daemon-config/src/main/kotlin/kotlin-daemon-config.settings.gradle.kts @@ -5,12 +5,7 @@ gradle.afterProject { plugins.withType { tasks.withType().configureEach { // Should be in sync with 'gradle-settings-conventions/gradle.properties' - kotlinDaemonJvmArguments.set( - listOf( - "-Xmx3g", - "-Dkotlin.js.compiler.legacy.force_enabled=true" - ) - ) + kotlinDaemonJvmArguments.set(listOf("-Xmx3g")) } } }