[Gradle, JS] Migrate on strings

This commit is contained in:
Ilya Goncharov
2020-02-14 16:34:20 +03:00
parent 9b462b76d4
commit 64f13ab3ae
2 changed files with 18 additions and 39 deletions
@@ -78,7 +78,7 @@ open class KotlinWebpack : DefaultTask(), RequiresNpmDependencies {
@Nested @Nested
val output: KotlinWebpackOutput = KotlinWebpackOutput( val output: KotlinWebpackOutput = KotlinWebpackOutput(
library = baseConventions?.archivesBaseName, library = baseConventions?.archivesBaseName,
libraryTarget = KotlinWebpackLibraryTarget.UMD libraryTarget = KotlinWebpackOutput.Target.UMD
) )
@get:Internal @get:Internal
@@ -6,47 +6,26 @@
package org.jetbrains.kotlin.gradle.targets.js.webpack package org.jetbrains.kotlin.gradle.targets.js.webpack
import org.gradle.api.tasks.Input import org.gradle.api.tasks.Input
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackLibraryTarget.Companion.fromString
data class KotlinWebpackOutput( data class KotlinWebpackOutput(
@Input var library: String?, @Input var library: String?,
@Input var libraryTarget: KotlinWebpackLibraryTarget? @Input var libraryTarget: String?
) { ) {
fun getLibraryTarget(): String { object Target {
return this.libraryTarget.toString() const val VAR = "var"
} const val ASSIGN = "assign"
const val THIS = "this"
fun setLibraryTarget(value: String) { const val WINDOW = "window"
this.libraryTarget = fromString(value) const val SELF = "self"
} const val GLOBAL = "global"
} const val COMMONJS = "commonjs"
const val COMMONJS2 = "commonjs2"
enum class KotlinWebpackLibraryTarget { const val COMMONJS_MODULE = "commonjs-module"
VAR, const val AMD = "amd"
ASSIGN, const val AMD_REQUIRE = "amd-require"
THIS, const val UMD = "umd"
WINDOW, const val UMD2 = "umd2"
SELF, const val JSONP = "jsonp"
GLOBAL, const val SYSTEM = "system"
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("-", "_"))
}
} }
} }