From c7f7f2bcbb6fd22b846be57bfa00511b856ae1e3 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 21 Apr 2020 18:41:38 +0300 Subject: [PATCH] [Gradle, JS] Add string sompiler setting in js plugin #KT-38485 fixed --- .../kotlin/gradle/dsl/KotlinProjectExtension.kt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt index 4baf36cff2a..822d26b15c7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt @@ -162,6 +162,17 @@ open class KotlinJsProjectExtension : body: KotlinJsTargetDsl.() -> Unit = { } ): KotlinJsTargetDsl = jsInternal(compiler, body) + fun js( + compiler: String, + body: KotlinJsTargetDsl.() -> Unit = { } + ): KotlinJsTargetDsl = js( + KotlinJsCompilerType.byArgument(compiler) + ?: throw IllegalArgumentException( + "Unable to find $compiler setting. Use [${KotlinJsCompilerType.values().toList().joinToString()}]" + ), + body + ) + fun js( body: KotlinJsTargetDsl.() -> Unit = { } ) = jsInternal(body = body) @@ -173,6 +184,11 @@ open class KotlinJsProjectExtension : ConfigureUtil.configure(configure, this) } + fun js(compiler: String, configure: Closure<*>) = + js(compiler = compiler) { + ConfigureUtil.configure(configure, this) + } + fun js(configure: Closure<*>) = jsInternal { ConfigureUtil.configure(configure, this) }