azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wizard: use settings.gradle instead of .kts for Groovy DSL Gradle projects

Browse Source 
#KT-35694 fixed
This commit is contained in:
Ilya Kirillov
2020-01-14 19:49:57 +03:00
parent 4f4106a17e
commit afc320ac8d
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/new-project-wizard/resources/org/jetbrains/kotlin/tools/projectWizard/templates/gradle/settings.gradle.vm
+5
View File
@@ -0,0 +1,5 @@
rootProject.name = '${projectName}';
#foreach($subProject in $subProjects)
include('${subProject}')
#end
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/buildSystem/gradle/GradlePlugin.kt
+13 -4
View File
@@ -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,