From 9a3bf54d9d91e5517691a8bffc27bb27f389f393 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Thu, 23 Apr 2020 14:59:40 +0300
Subject: [PATCH] [Gradle, JS] Add compiler type values on extension type

#KT-38519 fixed
---
 .../kotlin/gradle/plugin/KotlinJsCompilerTypeHolder.kt   | 9 +++++++++
 .../kotlin/gradle/dsl/KotlinProjectExtension.kt          | 7 +++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsCompilerTypeHolder.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsCompilerTypeHolder.kt
index bc391ce9296..9967adc1820 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsCompilerTypeHolder.kt
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsCompilerTypeHolder.kt
@@ -7,4 +7,13 @@ package org.jetbrains.kotlin.gradle.plugin
 
 interface KotlinJsCompilerTypeHolder {
     val defaultJsCompilerType: KotlinJsCompilerType
+
+    val LEGACY: KotlinJsCompilerType
+        get() = KotlinJsCompilerType.LEGACY
+
+    val IR: KotlinJsCompilerType
+        get() = KotlinJsCompilerType.IR
+
+    val BOTH: KotlinJsCompilerType
+        get() = KotlinJsCompilerType.BOTH
 }
\ No newline at end of file
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 50db1b7a0f1..dbcfd9610d2 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
@@ -11,7 +11,6 @@ import org.gradle.api.Project
 import org.gradle.api.internal.plugins.DslObject
 import org.gradle.util.ConfigureUtil
 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.KotlinJsSingleTargetPreset
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinWithJavaTarget
@@ -128,13 +127,13 @@ open class KotlinJsProjectExtension :
 
         if (_target == null) {
             val target: KotlinJsTargetDsl = when (compiler ?: defaultJsCompilerType) {
-                LEGACY -> legacyPreset
+                KotlinJsCompilerType.LEGACY -> legacyPreset
                     .also { it.irPreset = null }
                     .createTarget("js")
-                IR -> irPreset
+                KotlinJsCompilerType.IR -> irPreset
                     .also { it.mixedMode = false }
                     .createTarget("js")
-                BOTH -> legacyPreset
+                KotlinJsCompilerType.BOTH -> legacyPreset
                     .also {
                         irPreset.mixedMode = true
                         it.irPreset = irPreset