From 087de68b3a3d06fa5ef803d4609133f1ae77d2fc Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Mon, 10 Feb 2020 22:56:33 +0300
Subject: [PATCH] Wizard: flatten JVM targets

#KT-36267 fixed
---
 .../TargetConfigurationGroups.kt                   | 14 +++-----------
 .../moduleConfigurators/TargetConfigurator.kt      |  3 +++
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/TargetConfigurationGroups.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/TargetConfigurationGroups.kt
index 7f9067ae8b5..18d4b6f95b6 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/TargetConfigurationGroups.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/TargetConfigurationGroups.kt
@@ -4,15 +4,6 @@ import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ModuleSubType
 import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ModuleType
 
 object TargetConfigurationGroups {
-    val JVM = FinalTargetConfiguratorGroup(
-        ModuleType.jvm.projectTypeName,
-        ModuleType.jvm,
-        listOf(
-            JvmTargetConfigurator,
-            AndroidTargetConfigurator
-        )
-    )
-
     val JS = FinalTargetConfiguratorGroup(
         ModuleType.js.projectTypeName,
         ModuleType.js,
@@ -87,9 +78,10 @@ object TargetConfigurationGroups {
     val FIRST = FirstStepTargetConfiguratorGroup(
         listOf(
             CommonTargetConfigurator,
-            JVM,
+            JvmTargetConfigurator,
             NATIVE.ALL,
-            JS
+            JS,
+            AndroidTargetConfigurator
         )
     )
 }
\ No newline at end of file
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/TargetConfigurator.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/TargetConfigurator.kt
index 3079af72466..a2e93ab415f 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/TargetConfigurator.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/TargetConfigurator.kt
@@ -106,6 +106,9 @@ object JvmTargetConfigurator : JvmModuleConfigurator(),
     SingleCoexistenceTargetConfigurator {
     override val moduleSubType = ModuleSubType.jvm
 
+    override val text: String
+        get() = "JVM"
+
     override fun defaultTestFramework(): KotlinTestFramework = KotlinTestFramework.JUNIT4
 
     override fun ValuesReadingContext.createInnerTargetIrs(module: Module): List<BuildSystemIR> = buildList {