From d2450268f62033eb32ee085cd156e306c25e8589 Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Tue, 5 Jul 2022 21:09:55 +0200 Subject: [PATCH] [Gradle, JS] Migrate simple K/JS IC test to the new plugin (#KT-52946) --- .../kotlin/gradle/Kotlin2JsGradlePluginIT.kt | 8 +++---- .../kotlin2JsICProject/app/build.gradle | 22 ++++++++++++++----- .../kotlin2JsICProject/build.gradle | 16 -------------- .../kotlin2JsICProject/lib/build.gradle | 21 +++++++++++++----- 4 files changed, 35 insertions(+), 32 deletions(-) delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsICProject/build.gradle 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 9e6b611631c..f0a556b7304 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 @@ -268,7 +268,7 @@ class Kotlin2JsGradlePluginIT : AbstractKotlin2JsGradlePluginIT(false) { projectPath.resolve("$it/src/main").allKotlinFiles } - build("build") { + build("compileKotlinJs", "compileTestKotlinJs") { checkIrCompilationMessage() assertOutputContains(USING_JS_INCREMENTAL_COMPILATION_MESSAGE) if (irBackend) { @@ -278,7 +278,7 @@ class Kotlin2JsGradlePluginIT : AbstractKotlin2JsGradlePluginIT(false) { } } - build("build") { + build("compileKotlinJs", "compileTestKotlinJs") { assertCompiledKotlinSources(emptyList(), output) } @@ -286,7 +286,7 @@ class Kotlin2JsGradlePluginIT : AbstractKotlin2JsGradlePluginIT(false) { modifiedFile.modify { it.replace("val x = 0", "val x = \"a\"") } - build("build") { + build("compileKotlinJs", "compileTestKotlinJs") { checkIrCompilationMessage() assertOutputContains(USING_JS_INCREMENTAL_COMPILATION_MESSAGE) val affectedFiles = listOf("A.kt", "useAInLibMain.kt", "useAInAppMain.kt", "useAInAppTest.kt").mapNotNull { @@ -742,7 +742,7 @@ abstract class AbstractKotlin2JsGradlePluginIT(protected val irBackend: Boolean) } val options = defaultBuildOptions.copy(jsOptions = jsOptions) project("kotlin2JsICProject", gradleVersion, buildOptions = options) { - build("build") { + build("compileKotlinJs", "compileTestKotlinJs") { checkIrCompilationMessage() assertOutputDoesNotContain(USING_JS_INCREMENTAL_COMPILATION_MESSAGE) } 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 3c452784667..ba7965e4037 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,12 +1,22 @@ -apply plugin: 'org.jetbrains.kotlin.platform.js' +plugins { + id("org.jetbrains.kotlin.js") +} + +repositories { + mavenLocal() + mavenCentral() +} dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version" implementation project(":lib") } -def isIrBackend = project.findProperty("kotlin.js.useIrBackend")?.toBoolean() ?: false -if (isIrBackend) { - compileKotlin2Js.kotlinOptions.freeCompilerArgs += ["-Xir-produce-klib-dir", "-Xir-only"] - compileTestKotlin2Js.kotlinOptions.freeCompilerArgs += ["-Xir-produce-js"] -} +kotlin { + js { + browser { + + } + binaries.executable() + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsICProject/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsICProject/build.gradle deleted file mode 100644 index f37b00da1c9..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsICProject/build.gradle +++ /dev/null @@ -1,16 +0,0 @@ -buildscript { - repositories { - mavenLocal() - mavenCentral() - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - -subprojects { - repositories { - mavenLocal() - mavenCentral() - } -} \ No newline at end of file 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 2243fe0e68e..57cc932058b 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,11 +1,20 @@ -apply plugin: 'org.jetbrains.kotlin.platform.js' +plugins { + id("org.jetbrains.kotlin.js") +} + +repositories { + mavenLocal() + mavenCentral() +} dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version" } -def isIrBackend = project.findProperty("kotlin.js.useIrBackend")?.toBoolean() ?: false -if (isIrBackend) { - compileKotlin2Js.kotlinOptions.freeCompilerArgs += ["-Xir-produce-klib-dir", "-Xir-only"] - compileTestKotlin2Js.kotlinOptions.freeCompilerArgs += ["-Xir-produce-js"] -} +kotlin { + js { + browser { + + } + } +} \ No newline at end of file