Wizard: use settings.gradle instead of .kts for Groovy DSL Gradle projects
#KT-35694 fixed
This commit is contained in:
+5
@@ -0,0 +1,5 @@
|
|||||||
|
rootProject.name = '${projectName}';
|
||||||
|
|
||||||
|
#foreach($subProject in $subProjects)
|
||||||
|
include('${subProject}')
|
||||||
|
#end
|
||||||
+13
-4
@@ -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.BuildSystemPlugin
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.BuildSystemType
|
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.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.kotlin.KotlinPlugin
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.plugins.templates.TemplatesPlugin
|
import org.jetbrains.kotlin.tools.projectWizard.plugins.templates.TemplatesPlugin
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version
|
import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version
|
||||||
@@ -106,12 +107,20 @@ abstract class GradlePlugin(context: Context) : BuildSystemPlugin(context) {
|
|||||||
runBefore(TemplatesPlugin::addTemplatesToSourcesets)
|
runBefore(TemplatesPlugin::addTemplatesToSourcesets)
|
||||||
activityChecker = isGradle
|
activityChecker = isGradle
|
||||||
withAction {
|
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(
|
TemplatesPlugin::addFileTemplate.execute(
|
||||||
FileTemplate(
|
FileTemplate(
|
||||||
FileTemplateDescriptor(
|
templateDescriptor,
|
||||||
"gradle/settings.gradle.kts.vm",
|
|
||||||
"settings.gradle.kts".asPath()
|
|
||||||
),
|
|
||||||
StructurePlugin::projectPath.settingValue,
|
StructurePlugin::projectPath.settingValue,
|
||||||
mapOf(
|
mapOf(
|
||||||
"projectName" to StructurePlugin::name.settingValue,
|
"projectName" to StructurePlugin::name.settingValue,
|
||||||
|
|||||||
Reference in New Issue
Block a user