From 64f13ab3ae22e1df9e830b8e5bb977822223677a Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Fri, 14 Feb 2020 16:34:20 +0300
Subject: [PATCH] [Gradle, JS] Migrate on strings

---
 .../targets/js/webpack/KotlinWebpack.kt       |  2 +-
 .../targets/js/webpack/KotlinWebpackOutput.kt | 55 ++++++-------------
 2 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt
index f5bba34b750..99aac6cd4ec 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpack.kt
@@ -78,7 +78,7 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies {
     @Nested
     val output: KotlinWebpackOutput = KotlinWebpackOutput(
         library = baseConventions?.archivesBaseName,
-        libraryTarget = KotlinWebpackLibraryTarget.UMD
+        libraryTarget = KotlinWebpackOutput.Target.UMD
     )
 
     @get:Internal
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackOutput.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackOutput.kt
index 3e01baf772b..690c6d2da12 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackOutput.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/webpack/KotlinWebpackOutput.kt
@@ -6,47 +6,26 @@
 package org.jetbrains.kotlin.gradle.targets.js.webpack
 
 import org.gradle.api.tasks.Input
-import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackLibraryTarget.Companion.fromString
 
 data class KotlinWebpackOutput(
     @Input var library: String?,
-    @Input var libraryTarget: KotlinWebpackLibraryTarget?
+    @Input var libraryTarget: String?
 ) {
-    fun getLibraryTarget(): String {
-        return this.libraryTarget.toString()
-    }
-
-    fun setLibraryTarget(value: String) {
-        this.libraryTarget = fromString(value)
-    }
-}
-
-enum class KotlinWebpackLibraryTarget {
-    VAR,
-    ASSIGN,
-    THIS,
-    WINDOW,
-    SELF,
-    GLOBAL,
-    COMMONJS,
-    COMMONJS2,
-    COMMONJS_MODULE,
-    AMD,
-    AMD_REQUIRE,
-    UMD,
-    UMD2,
-    JSONP,
-    SYSTEM;
-
-    override fun toString(): String {
-        return super.toString()
-            .toLowerCase()
-            .replace("_", "-")
-    }
-
-    companion object {
-        internal fun fromString(value: String): KotlinWebpackLibraryTarget {
-            return valueOf(value.toUpperCase().replace("-", "_"))
-        }
+    object Target {
+        const val VAR = "var"
+        const val ASSIGN = "assign"
+        const val THIS = "this"
+        const val WINDOW = "window"
+        const val SELF = "self"
+        const val GLOBAL = "global"
+        const val COMMONJS = "commonjs"
+        const val COMMONJS2 = "commonjs2"
+        const val COMMONJS_MODULE = "commonjs-module"
+        const val AMD = "amd"
+        const val AMD_REQUIRE = "amd-require"
+        const val UMD = "umd"
+        const val UMD2 = "umd2"
+        const val JSONP = "jsonp"
+        const val SYSTEM = "system"
     }
 }
\ No newline at end of file