[Gradle, JS] Add compiler type values on extension type
#KT-38519 fixed
This commit is contained in:
+9
@@ -7,4 +7,13 @@ package org.jetbrains.kotlin.gradle.plugin
|
|||||||
|
|
||||||
interface KotlinJsCompilerTypeHolder {
|
interface KotlinJsCompilerTypeHolder {
|
||||||
val defaultJsCompilerType: KotlinJsCompilerType
|
val defaultJsCompilerType: KotlinJsCompilerType
|
||||||
|
|
||||||
|
val LEGACY: KotlinJsCompilerType
|
||||||
|
get() = KotlinJsCompilerType.LEGACY
|
||||||
|
|
||||||
|
val IR: KotlinJsCompilerType
|
||||||
|
get() = KotlinJsCompilerType.IR
|
||||||
|
|
||||||
|
val BOTH: KotlinJsCompilerType
|
||||||
|
get() = KotlinJsCompilerType.BOTH
|
||||||
}
|
}
|
||||||
+3
-4
@@ -11,7 +11,6 @@ import org.gradle.api.Project
|
|||||||
import org.gradle.api.internal.plugins.DslObject
|
import org.gradle.api.internal.plugins.DslObject
|
||||||
import org.gradle.util.ConfigureUtil
|
import org.gradle.util.ConfigureUtil
|
||||||
import org.jetbrains.kotlin.gradle.plugin.*
|
import org.jetbrains.kotlin.gradle.plugin.*
|
||||||
import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType.*
|
|
||||||
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
|
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
|
||||||
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsSingleTargetPreset
|
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsSingleTargetPreset
|
||||||
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinWithJavaTarget
|
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinWithJavaTarget
|
||||||
@@ -128,13 +127,13 @@ open class KotlinJsProjectExtension :
|
|||||||
|
|
||||||
if (_target == null) {
|
if (_target == null) {
|
||||||
val target: KotlinJsTargetDsl = when (compiler ?: defaultJsCompilerType) {
|
val target: KotlinJsTargetDsl = when (compiler ?: defaultJsCompilerType) {
|
||||||
LEGACY -> legacyPreset
|
KotlinJsCompilerType.LEGACY -> legacyPreset
|
||||||
.also { it.irPreset = null }
|
.also { it.irPreset = null }
|
||||||
.createTarget("js")
|
.createTarget("js")
|
||||||
IR -> irPreset
|
KotlinJsCompilerType.IR -> irPreset
|
||||||
.also { it.mixedMode = false }
|
.also { it.mixedMode = false }
|
||||||
.createTarget("js")
|
.createTarget("js")
|
||||||
BOTH -> legacyPreset
|
KotlinJsCompilerType.BOTH -> legacyPreset
|
||||||
.also {
|
.also {
|
||||||
irPreset.mixedMode = true
|
irPreset.mixedMode = true
|
||||||
it.irPreset = irPreset
|
it.irPreset = irPreset
|
||||||
|
|||||||
Reference in New Issue
Block a user