Extracted repositories

^KTL-1724

Author: dkrasnoff

build-settings-logic/settings.gradle.kts

@@ -1,14 +1,14 @@
 rootProject.name = "build-settings-logic"
 
-dependencyResolutionManagement {
+apply(from = "src/main/kotlin/kotlin-compiler-server-version-catalog.settings.gradle.kts")
 
-    @Suppress("UnstableApiUsage")
-    repositories {
-        mavenCentral()
-        gradlePluginPortal()
-    }
+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"))
         }
     }

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

@@ -1,4 +1,48 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+
+        val additionalRepositoryProperty = providers.gradleProperty("kotlin_repo_url")
+        if (additionalRepositoryProperty.isPresent) {
+            maven(additionalRepositoryProperty.get()) {
+                name = "KotlinDevRepo"
+            }
+            logger.info("A custom Kotlin repository ${additionalRepositoryProperty.get()} was added")
+        }
+
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
+    }
+}
+
 dependencyResolutionManagement {
+    @Suppress("UnstableApiUsage")
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+
+        val additionalRepositoryProperty = providers.gradleProperty("kotlin_repo_url")
+        if (additionalRepositoryProperty.isPresent) {
+            maven(additionalRepositoryProperty.get()) {
+                name = "KotlinDevRepo"
+            }
+            logger.info("A custom Kotlin repository ${additionalRepositoryProperty.get()} was added")
+        }
+
+        maven("https://repo.spring.io/snapshot")
+        maven("https://repo.spring.io/milestone")
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide")
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
+        maven("https://cache-redirector.jetbrains.com/jetbrains.bintray.com/intellij-third-party-dependencies")
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies")
+        maven("https://www.myget.org/F/rd-snapshots/maven/")
+        maven("https://kotlin.jetbrains.space/p/kotlin/packages/maven/kotlin-ide")
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+    }
+
     versionCatalogs {
         register("libs").configure {
             val kotlinVersion = providers.gradleProperty("kotlin_version")

build.gradle.kts

@@ -21,21 +21,6 @@ plugins {
 apply<NodeJsRootPlugin>()
 
 allprojects {
-    repositories {
-        mavenCentral()
-        gradlePluginPortal()
-        maven("https://repo.spring.io/snapshot")
-        maven("https://repo.spring.io/milestone")
-        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide")
-        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
-        maven("https://cache-redirector.jetbrains.com/jetbrains.bintray.com/intellij-third-party-dependencies")
-        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies")
-        maven("https://www.myget.org/F/rd-snapshots/maven/")
-        maven("https://kotlin.jetbrains.space/p/kotlin/packages/maven/kotlin-ide")
-        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
-        maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-    }
     afterEvaluate {
         dependencies {
             dependencies {

buildSrc/build.gradle.kts

@@ -2,10 +2,6 @@ plugins {
     `kotlin-dsl`
 }
 
-repositories {
-    mavenCentral()
-}
-
 // workaround to pass libs into conventions (see https://github.com/gradle/gradle/issues/15383)
 dependencies {
     implementation(libs.kotlin.gradlePlugin)

settings.gradle.kts

@@ -1,11 +1,6 @@
 rootProject.name = "kotlin-compiler-server"
 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")