From bcd2707fe66fa8588054524a30b8098e78fb4722 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 3 Feb 2020 16:58:47 +0300 Subject: [PATCH] [Gradle, JS] Fix naming from jsMode to jsCompilerType --- .../org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt | 4 ++-- .../kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt | 2 +- .../org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt | 2 +- .../kotlin/gradle/util/{jsMode.kt => jsCompilerType.kt} | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/{jsMode.kt => jsCompilerType.kt} (87%) 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 e9f8490ed3b..9382e739a8e 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 @@ -6,7 +6,7 @@ import org.jetbrains.kotlin.gradle.tasks.USING_JS_INCREMENTAL_COMPILATION_MESSAG import org.jetbrains.kotlin.gradle.tasks.USING_JS_IR_BACKEND_MESSAGE import org.jetbrains.kotlin.gradle.util.getFileByName import org.jetbrains.kotlin.gradle.util.getFilesByNames -import org.jetbrains.kotlin.gradle.util.jsMode +import org.jetbrains.kotlin.gradle.util.jsCompilerType import org.jetbrains.kotlin.gradle.util.modify import org.junit.Assume.assumeFalse import org.junit.Test @@ -510,7 +510,7 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) : gradleSettingsScript().modify(::transformBuildScriptWithPluginsDsl) if (!irBackend) { - gradleProperties().appendText(jsMode(JsCompilerType.legacy)) + gradleProperties().appendText(jsCompilerType(JsCompilerType.legacy)) } build("build") { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt index 37dc83812e7..3b752537a4d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt @@ -2310,7 +2310,7 @@ class NewMultiplatformIT : BaseGradleIT() { setupWorkingDir() gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl) if (!jsIr) { - gradleProperties().appendText(jsMode(JsCompilerType.legacy)) + gradleProperties().appendText(jsCompilerType(JsCompilerType.legacy)) } val tasks = listOf("jvm", "js", nativeHostTargetName).map { ":compileIntegrationTestKotlin${it.capitalize()}" } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt index 8214a502165..e9aed8ba1e4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesIT.kt @@ -40,7 +40,7 @@ class VariantAwareDependenciesIT : BaseGradleIT() { assertContains(">> :${innerProject.projectName}:runtime --> sample-lib-nodejs-1.0.klib") } - gradleProperties().appendText(jsMode(JsCompilerType.legacy)) + gradleProperties().appendText(jsCompilerType(JsCompilerType.legacy)) testResolveAllConfigurations( subproject = innerProject.projectName, diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/jsMode.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/jsCompilerType.kt similarity index 87% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/jsMode.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/jsCompilerType.kt index c84a0ac9871..b060498e338 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/jsMode.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/jsCompilerType.kt @@ -7,5 +7,5 @@ package org.jetbrains.kotlin.gradle.util import org.jetbrains.kotlin.gradle.targets.js.JsCompilerType -fun jsMode(compilerType: JsCompilerType) = +fun jsCompilerType(compilerType: JsCompilerType) = "\n${JsCompilerType.jsCompilerProperty}=$compilerType" \ No newline at end of file