Extracted common Gradle settings logic to the settings plugin

Author: dkrasnoff

build-settings-logic/build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+    `kotlin-dsl`
+}

build-settings-logic/settings.gradle.kts

@@ -0,0 +1,10 @@
+rootProject.name = "build-settings-logic"
+
+dependencyResolutionManagement {
+
+    @Suppress("UnstableApiUsage")
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}

build-settings-logic/src/main/kotlin/kotlin-compiler-server-version-catalog.settings.gradle.kts

@@ -0,0 +1,10 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        register("libs").configure {
+            val kotlinVersion = providers.gradleProperty("kotlinVersion")
+            if (kotlinVersion.isPresent) {
+                version("kotlin", kotlinVersion.get())
+            }
+        }
+    }
+}

buildSrc/settings.gradle.kts

@@ -1,13 +1,19 @@
+pluginManagement {
+    includeBuild("../build-settings-logic")
+}
+
 dependencyResolutionManagement {
+    // For buildSrc we need to declare a custom path to the toml file with versions' catalog.
+    // But for a root project we can't set `from` inside `versionCatalogs` catalog block for the default `libs` catalog.
+    // (see https://github.com/gradle/gradle/issues/21328)
+    // That is why it is not fully moved to the dependencyResolutionManagement block in the settings convention plugin.
     versionCatalogs {
-        create("libs") {
+        getByName("libs") {
             from(files("../gradle/libs.versions.toml"))
         }
-        val kotlinVersion = providers.gradleProperty("kotlinVersion")
-        if (kotlinVersion.isPresent) {
-            create("libs") {
-                version("kotlin", kotlinVersion.get())
-            }
-        }
     }
+}
+
+plugins {
+    id("kotlin-compiler-server-version-catalog")
 }

settings.gradle.kts

@@ -1,24 +1,17 @@
 rootProject.name = "kotlin-compiler-server"
-include(":executors")
-include(":indexation")
-include(":common")
-include(":dependencies")
-
 pluginManagement {
+    includeBuild("build-settings-logic")
     repositories {
         gradlePluginPortal()
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
     }
 }
+plugins {
+    id("kotlin-compiler-server-version-catalog")
+}
 
-dependencyResolutionManagement {
-    versionCatalogs {
-        val kotlinVersion = providers.gradleProperty("kotlinVersion")
-        if (kotlinVersion.isPresent) {
-            create("libs") {
-                version("kotlin", kotlinVersion.get())
-            }
-        }
-    }
-}
+include(":executors")
+include(":indexation")
+include(":common")
+include(":dependencies")