From afc320ac8d608c0d8fbfe4405dea2a91ba4c3b9c Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Tue, 14 Jan 2020 19:49:57 +0300
Subject: [PATCH] Wizard: use settings.gradle instead of .kts for Groovy DSL
 Gradle projects

#KT-35694 fixed
---
 .../templates/gradle/settings.gradle.vm         |  5 +++++
 .../plugins/buildSystem/gradle/GradlePlugin.kt  | 17 +++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 libraries/tools/new-project-wizard/resources/org/jetbrains/kotlin/tools/projectWizard/templates/gradle/settings.gradle.vm

diff --git a/libraries/tools/new-project-wizard/resources/org/jetbrains/kotlin/tools/projectWizard/templates/gradle/settings.gradle.vm b/libraries/tools/new-project-wizard/resources/org/jetbrains/kotlin/tools/projectWizard/templates/gradle/settings.gradle.vm
new file mode 100644
index 00000000000..8149c48ce31
--- /dev/null
+++ b/libraries/tools/new-project-wizard/resources/org/jetbrains/kotlin/tools/projectWizard/templates/gradle/settings.gradle.vm
@@ -0,0 +1,5 @@
+rootProject.name = '${projectName}';
+
+#foreach($subProject in $subProjects)
+include('${subProject}')
+#end
\ No newline at end of file
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/buildSystem/gradle/GradlePlugin.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/buildSystem/gradle/GradlePlugin.kt
index 10d867dcc3f..cb27a83c88c 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/buildSystem/gradle/GradlePlugin.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/buildSystem/gradle/GradlePlugin.kt
@@ -7,6 +7,7 @@ import org.jetbrains.kotlin.tools.projectWizard.plugins.StructurePlugin
 import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.BuildSystemPlugin
 import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.BuildSystemType
 import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.allModulesPaths
+import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.buildSystemType
 import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.KotlinPlugin
 import org.jetbrains.kotlin.tools.projectWizard.plugins.templates.TemplatesPlugin
 import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version
@@ -106,12 +107,20 @@ abstract class GradlePlugin(context: Context) : BuildSystemPlugin(context) {
         runBefore(TemplatesPlugin::addTemplatesToSourcesets)
         activityChecker = isGradle
         withAction {
+            val templateDescriptor = when (buildSystemType) {
+                BuildSystemType.GradleKotlinDsl -> FileTemplateDescriptor(
+                    "gradle/settings.gradle.kts.vm",
+                    "settings.gradle.kts".asPath()
+                )
+                BuildSystemType.GradleGroovyDsl -> FileTemplateDescriptor(
+                    "gradle/settings.gradle.vm",
+                    "settings.gradle".asPath()
+                )
+                else -> return@withAction UNIT_SUCCESS
+            }
             TemplatesPlugin::addFileTemplate.execute(
                 FileTemplate(
-                    FileTemplateDescriptor(
-                        "gradle/settings.gradle.kts.vm",
-                        "settings.gradle.kts".asPath()
-                    ),
+                    templateDescriptor,
                     StructurePlugin::projectPath.settingValue,
                     mapOf(
                         "projectName" to StructurePlugin::name.settingValue,