From c2a6654194ff9c4aa9d135c848b2f49d8f84ba49 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Wed, 15 May 2019 13:47:15 +0300 Subject: [PATCH] Gradle, js: don't use any subtarget by default --- .../kotlin/gradle/targets/js/KotlinJsTarget.kt | 10 ---------- .../gradle/targets/js/KotlinJsTargetConfigurator.kt | 1 - 2 files changed, 11 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTarget.kt index fbfd935779f..b2f06b9ac7b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTarget.kt @@ -36,16 +36,12 @@ class KotlinJsTarget(project: Project, platformType: KotlinPlatformType) : val runTaskName get() = lowerCamelCaseName(disambiguationClassifier, runTaskNameSuffix) val runTask get() = project.tasks.maybeCreate(runTaskName) - private var hasSubtargets = false - val browser by lazy { - hasSubtargets = true KotlinBrowserJs(this).also { it.configure() } } val nodejs by lazy { - hasSubtargets = true KotlinNodeJs(this).also { it.configure() } @@ -58,10 +54,4 @@ class KotlinJsTarget(project: Project, platformType: KotlinPlatformType) : override fun nodejs(body: KotlinJsNodeDsl.() -> Unit) { nodejs.body() } - - fun configureDefaults() { - if (!hasSubtargets) { - browser() - } - } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt index a22a587f906..73aaddfff49 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTargetConfigurator.kt @@ -19,7 +19,6 @@ open class KotlinJsTargetConfigurator(kotlinPluginVersion: String) : override fun configureTarget(target: KotlinOnlyTarget) { target as KotlinJsTarget - target.configureDefaults() super.configureTarget(target) target.compilations.forEach {