From cc97138e9c569a76e62f6afc7c407dd036fb90a7 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Wed, 19 Feb 2020 12:30:04 +0300
Subject: [PATCH] [Gradle, JS] Extract JS presets container, no js in codegen
 since now

---
 .../gradle/dsl/mppPresetFunctionsCodegen.kt       | 15 +++++----------
 .../KotlinTargetContainerWithPresetFunctions.kt   |  5 +----
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/mppPresetFunctionsCodegen.kt b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/mppPresetFunctionsCodegen.kt
index d4163899643..4175f17b3ba 100644
--- a/libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/mppPresetFunctionsCodegen.kt
+++ b/libraries/tools/kotlin-gradle-plugin-dsl-codegen/src/main/kotlin/org/jetbrains/kotlin/generators/gradle/dsl/mppPresetFunctionsCodegen.kt
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.generators.gradle.dsl
 
 import groovy.lang.Closure
 import org.gradle.util.ConfigureUtil
-import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerTypeHolder
 import org.jetbrains.kotlin.gradle.plugin.KotlinTargetsContainerWithPresets
 import java.io.File
 
@@ -15,10 +14,7 @@ fun main() {
     generateKotlinTargetContainerWithPresetFunctionsInterface()
 }
 
-private val parentInterfaces = listOf(
-    KotlinTargetsContainerWithPresets::class,
-    KotlinJsCompilerTypeHolder::class
-)
+private val parentInterface = KotlinTargetsContainerWithPresets::class
 
 private val presetsProperty = KotlinTargetsContainerWithPresets::presets.name
 
@@ -28,16 +24,15 @@ private fun generateKotlinTargetContainerWithPresetFunctionsInterface() {
         generatePresetFunctions(it, presetsProperty, "configureOrCreate")
     }
 
-    val parentInterfaceNames =
-        parentInterfaces.map { typeName(it.java.canonicalName) }
-
+    val parentInterfaceName =
+        typeName(parentInterface.java.canonicalName)
 
     val className =
         typeName("org.jetbrains.kotlin.gradle.dsl.KotlinTargetContainerWithPresetFunctions")
 
     val imports = allPresetEntries
         .flatMap { it.typeNames() }
-        .plus(parentInterfaceNames)
+        .plus(parentInterfaceName)
         .plus(typeName(ConfigureUtil::class.java.canonicalName))
         .plus(typeName(Closure::class.java.canonicalName))
         .filter { it.packageName() != className.packageName() }
@@ -51,7 +46,7 @@ private fun generateKotlinTargetContainerWithPresetFunctionsInterface() {
         "package ${className.packageName()}",
         imports,
         generatedCodeWarning,
-        "interface ${className.renderShort()} : ${parentInterfaceNames.joinToString { it.renderShort() }} {",
+        "interface ${className.renderShort()} : ${parentInterfaceName.renderShort()} {",
         functions.joinToString("\n\n") { it.indented(4) },
         "}"
     ).joinToString("\n\n")
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithPresetFunctions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithPresetFunctions.kt
index 784de03f848..c80d377663e 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithPresetFunctions.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinTargetContainerWithPresetFunctions.kt
@@ -2,16 +2,13 @@ package org.jetbrains.kotlin.gradle.dsl
 
 import groovy.lang.Closure
 import org.gradle.util.ConfigureUtil
-import org.jetbrains.kotlin.gradle.plugin.JsCompilerType
-import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerTypeHolder
-import org.jetbrains.kotlin.gradle.plugin.KotlinTargetPreset
 import org.jetbrains.kotlin.gradle.plugin.KotlinTargetsContainerWithPresets
 import org.jetbrains.kotlin.gradle.plugin.mpp.*
 import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
 
 // DO NOT EDIT MANUALLY! Generated by org.jetbrains.kotlin.generators.gradle.dsl.MppPresetFunctionsCodegenKt
 
-interface KotlinTargetContainerWithPresetFunctions : KotlinTargetsContainerWithPresets, KotlinJsCompilerTypeHolder {
+interface KotlinTargetContainerWithPresetFunctions : KotlinTargetsContainerWithPresets {
 
     fun jvm(
         name: String = "jvm",