Unify both settings.gradle & buildSrc/build.gradle with repositories …

…defined in gradle/repositories.settings.gradle (#1267)
korlibs · Feb 3, 2023 · c18b76d · c18b76d
1 parent f47b78a
commit c18b76d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -22,16 +22,7 @@ dependencies {
     }
 }
 
-repositories {
-    mavenLocal()
-    mavenCentral()
-    google()
-    maven { url = uri("https://plugins.gradle.org/m2/") }
-    maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/temporary") }
-    maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") }
-    maven { url = uri("https://maven.pkg.jetbrains.space/public/p/kotlinx-coroutines/maven") }
-    maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") }
-}
+Eval.xy(this, this, file("../gradle/repositories.settings.gradle").text)
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions.suppressWarnings = true

diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
@@ -1,3 +1,7 @@
+pluginManagement {
+    Eval.xy(this, it, file('../gradle/repositories.settings.gradle').text)
+}
+
 dependencyResolutionManagement {
     versionCatalogs {
         libs {

diff --git a/gradle/repositories.settings.gradle b/gradle/repositories.settings.gradle
@@ -0,0 +1,12 @@
+// x=Settings/Project
+// y=PluginManagementSpec/Project
+y.repositories {
+    mavenLocal()
+    mavenCentral()
+    google()
+    gradlePluginPortal()
+    maven { url = x.uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/temporary") }
+    maven { url = x.uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") }
+    maven { url = x.uri("https://maven.pkg.jetbrains.space/public/p/kotlinx-coroutines/maven") }
+    maven { url = x.uri("https://oss.sonatype.org/content/repositories/snapshots/") }
+}
diff --git a/settings.gradle b/settings.gradle
@@ -1,12 +1,5 @@
 pluginManagement {
-	repositories {
-        mavenLocal()
-		mavenCentral()
-		gradlePluginPortal()
-        maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/temporary") }
-        maven { url = uri("https://maven.pkg.jetbrains.space/public/p/kotlinx-coroutines/maven") }
-        maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") }
-	}
+    Eval.xy(this, it, file('./gradle/repositories.settings.gradle').text)
 }
 
 rootProject.name = "${rootDir.name}-root"