Use dependencyResolutionManagement for repos

metaborg · Jul 17, 2024 · 6e37f32 · 6e37f32
1 parent 44bac60
commit 6e37f32
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/convention-plugin/settings.gradle.kts b/convention-plugin/settings.gradle.kts
@@ -1,13 +1,19 @@
 rootProject.name = "convention-plugin"
 
-// This allows us to use plugins from Metaborg Artifacts
+dependencyResolutionManagement {
+    repositories {
+        maven("https://artifacts.metaborg.org/content/groups/public/")
+        mavenCentral()
+    }
+}
+
 pluginManagement {
     repositories {
         maven("https://artifacts.metaborg.org/content/groups/public/")
+        gradlePluginPortal()
     }
 }
 
-// This downloads an appropriate JVM if not already available
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
diff --git a/depman/settings.gradle.kts b/depman/settings.gradle.kts
@@ -1,20 +1,23 @@
-rootProject.name = "spoofax3-depman"
+rootProject.name = "depman"
 
-// This allows us to use plugins from Metaborg Artifacts
-pluginManagement {
+dependencyResolutionManagement {
     repositories {
         maven("https://artifacts.metaborg.org/content/groups/public/")
+        mavenCentral()
     }
 }
 
-include(":catalog")
-include(":platform")
-include(":example")
-
-// The `org.metaborg.convention.settings` plugin would apply the FooJay plugin,
-//  but to avoid a bootstrapping issue, we'll do the same manually here:
+pluginManagement {
+    repositories {
+        maven("https://artifacts.metaborg.org/content/groups/public/")
+        gradlePluginPortal()
+    }
+}
 
-// This downloads an appropriate JVM if not already available
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
+
+include(":catalog")
+include(":platform")
+include(":example")
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,13 +1,19 @@
 rootProject.name = "metaborg-gradle-project"
 
-// This allows us to use plugins from Metaborg Artifacts
+dependencyResolutionManagement {
+    repositories {
+        maven("https://artifacts.metaborg.org/content/groups/public/")
+        mavenCentral()
+    }
+}
+
 pluginManagement {
     repositories {
         maven("https://artifacts.metaborg.org/content/groups/public/")
+        gradlePluginPortal()
     }
 }
 
-// This downloads an appropriate JVM if not already available
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }