Wizard: flatten JVM targets

#KT-36267 fixed

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
         )
     )
 }

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 {