[Kotlin|Gradle|NPW] fix: don't register foojay plugin for new depende…

…nt Gradle module The current implementation of settings script builder doesn't allow parsing and merging existed and generated code blocks. Therefore, we should add foojay plugin in an existing Gradle settings script. ## Issues * IDEA-366878 An unnecessary additional plugin block is added to the settings.gradle(.kts) when a new Kotlin module is added ## Tests * org.jetbrains.kotlin.tools.projectWizard.wizard.GradleKotlinNewProjectWizardTest GitOrigin-RevId: fd076f0684a2ee2a7d28d116e93350d37d8c4da4
rock3r · Feb 6, 2025 · 52618a1 · 52618a1
1 parent ee51daf
commit 52618a1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/...radle/src/org/jetbrains/kotlin/tools/projectWizard/gradle/GradleKotlinNewProjectWizard.kt b/...radle/src/org/jetbrains/kotlin/tools/projectWizard/gradle/GradleKotlinNewProjectWizard.kt
@@ -335,7 +335,7 @@ internal class GradleKotlinNewProjectWizard : BuildSystemKotlinNewProjectWizard
             }
 
             addOrConfigureSettingsScript {
-                if (parent.isFoojayPluginSupported || parent.isCreatingDaemonToolchain) {
+                if (parent.isCreatingNewLinkedProject && parent.isFoojayPluginSupported || parent.isCreatingDaemonToolchain) {
                     withFoojayPlugin()
                 }
             }

diff --git a/.../test/org/jetbrains/kotlin/tools/projectWizard/wizard/GradleKotlinNewProjectWizardTest.kt b/.../test/org/jetbrains/kotlin/tools/projectWizard/wizard/GradleKotlinNewProjectWizardTest.kt
@@ -356,6 +356,7 @@ class GradleKotlinNewProjectWizardTest : GradleCreateProjectTestCase(), NewKotli
     private fun simpleJavaProject(useKotlinDsl: Boolean) = projectInfo("project", useKotlinDsl) {
         withJavaBuildFile()
         withSettingsFile {
+            withFoojayPlugin()
             setProjectName("project")
         }
     }
@@ -400,6 +401,7 @@ class GradleKotlinNewProjectWizardTest : GradleCreateProjectTestCase(), NewKotli
             withKotlinJvmPlugin("1.9.0")
         }
         withSettingsFile {
+            withFoojayPlugin()
             setProjectName("project")
         }
     }
@@ -459,6 +461,7 @@ class GradleKotlinNewProjectWizardTest : GradleCreateProjectTestCase(), NewKotli
             }
         }
         withSettingsFile {
+            withFoojayPlugin()
             setProjectName("project")
             include("othermodule")
         }
@@ -517,6 +520,7 @@ class GradleKotlinNewProjectWizardTest : GradleCreateProjectTestCase(), NewKotli
             }
         }
         withSettingsFile {
+            withFoojayPlugin()
             setProjectName("project")
         }
         withFile(

diff --git a/...tData/gradleNewProjectWizard/newModuleInKotlinProjectIndependentHierarchy/settings.gradle b/...tData/gradleNewProjectWizard/newModuleInKotlinProjectIndependentHierarchy/settings.gradle
@@ -1 +1,4 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version 'FOOJAY_VERSION'
+}
 rootProject.name = 'project'
diff --git a/...radleNewProjectWizard/newModuleInKotlinProjectIndependentHierarchyKts/settings.gradle.kts b/...radleNewProjectWizard/newModuleInKotlinProjectIndependentHierarchyKts/settings.gradle.kts
@@ -1 +1,4 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "FOOJAY_VERSION"
+}
 rootProject.name = "project"