From f95ff049c636f20df01b0b22587b7e4d8c8c7809 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 23 Apr 2020 18:02:08 +0300 Subject: [PATCH] [Gradle, JS] Test check several ways to configure compiler type #KT-38519 fixed --- .../org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt | 5 +++-- .../kotlin-js-browser-project/base/build.gradle.kts | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) 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 e044780e900..db4f78e38cf 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 @@ -616,7 +616,8 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) : assertTasksExecuted(":app:browserProductionWebpack") - assertFileExists("build/js/packages/kotlin-js-browser-base") + assertFileExists("build/js/packages/kotlin-js-browser-base-jsIr") + assertFileExists("build/js/packages/kotlin-js-browser-base-jsLegacy") assertFileExists("build/js/packages/kotlin-js-browser-lib") assertFileExists("build/js/packages/kotlin-js-browser-app") @@ -630,7 +631,7 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) : assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin.js") assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin-js-browser-app.js") assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin-js-browser-lib.js") - assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin-js-browser-base.js") + assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin-js-browser-base-jsLegacy.js") assertFileExists("app/build/distributions/app.js.map") } 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 acc85844736..19fc0c37bb9 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 @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType.BOTH as BOTH_TYPE + plugins { kotlin("js") } @@ -7,7 +9,9 @@ dependencies { } kotlin { - target { + js("both") + js(BOTH) + js(BOTH_TYPE) { useCommonJs() browser { }