azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Do not duplicate target initialization

Browse Source
This commit is contained in:
Ilya Goncharov
2020-02-19 12:04:51 +03:00
parent 881de0a538
commit 956b57a55d
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt
+23 -21
View File
@@ -117,30 +117,32 @@ open class KotlinJsProjectExtension :
compiler: JsCompilerType = defaultJsCompilerType,
body: KotlinJsTargetDsl.() -> Unit
) {
val target: KotlinJsTargetDsl = when (compiler) {
legacy -> legacyPreset
.also { it.irPreset = null }
.createTarget("js")
ir -> irPreset
.also { it.mixedMode = false }
.createTarget("js")
both -> legacyPreset
.also {
irPreset.mixedMode = true
it.irPreset = irPreset
}
.createTarget(
lowerCamelCaseName(
"js",
legacy.name
if (_target == null) {
val target: KotlinJsTargetDsl = when (compiler) {
legacy -> legacyPreset
.also { it.irPreset = null }
.createTarget("js")
ir -> irPreset
.also { it.mixedMode = false }
.createTarget("js")
both -> legacyPreset
.also {
irPreset.mixedMode = true
it.irPreset = irPreset
}
.createTarget(
lowerCamelCaseName(
"js",
legacy.name
)
)
)
}
this._target = target
target.project.components.addAll(target.components)
}
this._target = target
target.project.components.addAll(target.components)
target.run(body)
}