MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] Added AbstractGradleModuleBuilder method to disable settings script generation

Browse Source 
KTIJ-31047

GitOrigin-RevId: e74d61a7dd113bf225f0df9ade691aee3781dd91
This commit is contained in:
Frederik Haselmeier
2024-09-21 21:50:02 +02:00
committed by intellij-monorepo-bot
parent 94bc1d5924
commit 267b8ea65b
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/gradle/java/src/service/project/wizard/AbstractGradleModuleBuilder.java
View File

@@ -111,6 +111,7 @@ public abstract class AbstractGradleModuleBuilder extends AbstractExternalModule
private @Nullable String gradleHome;
private boolean isCreatingBuildScriptFile = true;
private boolean isCreatingSettingsScriptFile = true;
private VirtualFile buildScriptFile;
private VirtualFile settingsScriptFile;
private GradleBuildScriptBuilder<?> buildScriptBuilder;
@@ -165,12 +166,14 @@ public abstract class AbstractGradleModuleBuilder extends AbstractExternalModule
buildScriptFile = setupGradleBuildFile(modelContentRootDir);
}
settingsScriptFile = setupGradleSettingsFile(
rootProjectPath, modelContentRootDir, project.getName(),
myProjectId == null ? module.getName() : myProjectId.getArtifactId(),
isCreatingNewLinkedProject(),
myUseKotlinDSL
);
if (isCreatingSettingsScriptFile) {
settingsScriptFile = setupGradleSettingsFile(
rootProjectPath, modelContentRootDir, project.getName(),
myProjectId == null ? module.getName() : myProjectId.getArtifactId(),
isCreatingNewLinkedProject(),
myUseKotlinDSL
);
}
if (isCreatingBuildScriptFile) {
buildScriptBuilder = GradleBuildScriptBuilder.create(gradleVersion, myUseKotlinDSL);
@@ -519,6 +522,14 @@ public abstract class AbstractGradleModuleBuilder extends AbstractExternalModule
gradleHome = path;
}
public void setCreatingSettingsScriptFile(boolean creatingSettingsScriptFile) {
this.isCreatingSettingsScriptFile = creatingSettingsScriptFile;
}
public boolean isCreatingSettingsScriptFile() {
return isCreatingSettingsScriptFile;
}
public void setCreatingBuildScriptFile(boolean creatingBuildScriptFile) {
this.isCreatingBuildScriptFile = creatingBuildScriptFile;
}

1
plugins/kotlin/project-wizard/gradle/src/org/jetbrains/kotlin/tools/projectWizard/gradle/GradleKotlinNewProjectWizard.kt
View File

@@ -323,6 +323,7 @@ internal class GradleKotlinNewProjectWizard : BuildSystemKotlinNewProjectWizard
if (parent.shouldGenerateMultipleModules) {
val moduleBuilder = GradleKotlinModuleBuilder()
moduleBuilder.setCreateEmptyContentRoots(false)
moduleBuilder.isCreatingSettingsScriptFile = false
moduleBuilder.isCreatingBuildScriptFile = false
parent.setupBuilder(moduleBuilder)
parent.setupProject(project, moduleBuilder)