From e7a45fb536944be6ac6b53c64a63ab56fcc87e6c Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Mon, 21 Oct 2019 19:24:46 +0300
Subject: [PATCH] [Gradle, JS] JS specific build variants

---
 .../gradle/targets/js/dsl/BuildVariant.kt     |  6 ++--
 .../targets/js/subtargets/KotlinBrowserJs.kt  | 28 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/BuildVariant.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/BuildVariant.kt
index af1d47eb7ec..d307b5427e2 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/BuildVariant.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/BuildVariant.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.gradle.targets.js.dsl
 import org.gradle.api.Named
 
 class BuildVariant(private val name: String) : Named {
-    var kind: BuildVariantKind = BuildVariantKind.RELEASE
+    var kind: BuildVariantKind = BuildVariantKind.PRODUCTION
 
     override fun getName(): String {
         return name
@@ -16,6 +16,6 @@ class BuildVariant(private val name: String) : Named {
 }
 
 enum class BuildVariantKind {
-    RELEASE,
-    DEBUG
+    PRODUCTION,
+    DEVELOPMENT
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt
index dfff43c1a1f..37985a568c7 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt
@@ -107,14 +107,14 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
                 it.outputs.upToDateWhen { false }
 
                 when (kind) {
-                    BuildVariantKind.RELEASE -> {
+                    BuildVariantKind.PRODUCTION -> {
                         dceOutputFileAppliers.add { file ->
                             it.entry = file
                         }
                         it.resolveFromModulesFirst = true
                         it.dependsOn(dceTaskProvider)
                     }
-                    BuildVariantKind.DEBUG -> {
+                    BuildVariantKind.DEVELOPMENT -> {
                         it.dependsOn(compileKotlinTask)
                     }
                 }
@@ -130,7 +130,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
                 }
             }
 
-            if (kind == BuildVariantKind.DEBUG) {
+            if (kind == BuildVariantKind.DEVELOPMENT) {
                 target.runTask.dependsOn(runTask)
             }
         }
@@ -166,14 +166,14 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
                 it.description = "build webpack ${kind.name.toLowerCase()} bundle"
 
                 when (kind) {
-                    BuildVariantKind.RELEASE -> {
+                    BuildVariantKind.PRODUCTION -> {
                         dceOutputFileAppliers.add { file ->
                             it.entry = file
                         }
                         it.resolveFromModulesFirst = true
                         it.dependsOn(dceTaskProvider)
                     }
-                    BuildVariantKind.DEBUG -> {
+                    BuildVariantKind.DEVELOPMENT -> {
                         it.dependsOn(compileKotlinTask)
                     }
                 }
@@ -189,7 +189,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
                 }
             }
 
-            if (kind == BuildVariantKind.RELEASE) {
+            if (kind == BuildVariantKind.PRODUCTION) {
                 project.tasks.getByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME).dependsOn(webpackTask)
             }
         }
@@ -243,17 +243,17 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
         releaseValue: T,
         debugValue: T
     ): T = when (kind) {
-        BuildVariantKind.RELEASE -> releaseValue
-        BuildVariantKind.DEBUG -> debugValue
+        BuildVariantKind.PRODUCTION -> releaseValue
+        BuildVariantKind.DEVELOPMENT -> debugValue
     }
 
     override fun configureBuildVariants() {
         buildVariants = project.container(BuildVariant::class.java)
-        buildVariants.create(RELEASE) {
-            it.kind = BuildVariantKind.RELEASE
+        buildVariants.create(PRODUCTION) {
+            it.kind = BuildVariantKind.PRODUCTION
         }
-        buildVariants.create(DEBUG) {
-            it.kind = BuildVariantKind.DEBUG
+        buildVariants.create(DEVELOPMENT) {
+            it.kind = BuildVariantKind.DEVELOPMENT
         }
     }
 
@@ -263,7 +263,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
 
         const val DCE_DIR = "kotlin-dce"
 
-        const val RELEASE = "release"
-        const val DEBUG = "debug"
+        const val PRODUCTION = "production"
+        const val DEVELOPMENT = "development"
     }
 }
\ No newline at end of file