Attempt a little more repo cleanup

EngineHub · Jul 21, 2024 · 46eff6a · 46eff6a
1 parent da22367
commit 46eff6a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -8,10 +8,6 @@ repositories {
         name = "EngineHub Repository"
         url = uri("https://maven.enginehub.org/repo/")
     }
-    maven {
-        name = "SpongePowered"
-        url = uri("https://repo.spongepowered.org/repository/maven-public/")
-    }
 }
 
 dependencies {

diff --git a/build-logic/src/main/kotlin/buildlogic.adapter.gradle.kts b/build-logic/src/main/kotlin/buildlogic.adapter.gradle.kts
@@ -23,7 +23,7 @@ repositories {
     }
     mavenCentral()
     afterEvaluate {
-        replaceNonEngineHubRepositoriesUrl()
+        killNonEngineHubRepositories()
     }
 }
 

diff --git a/build-logic/src/main/kotlin/repositoriesHelper.kt b/build-logic/src/main/kotlin/repositoriesHelper.kt
@@ -1,7 +1,6 @@
 import org.gradle.api.artifacts.dsl.RepositoryHandler
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository
 import org.gradle.api.logging.Logging
-import java.net.URI
 
 // The primary point of this is repository up-time. We replace most other repositories with EngineHub's repository.
 // This is because we have stronger up-time guarantees for our repository. However, Maven Central and Sonatype are
@@ -15,13 +14,15 @@ private val ALLOWED_PREFIXES = listOf(
 )
 private val LOGGER = Logging.getLogger("repositoriesHelper")
 
-fun RepositoryHandler.replaceNonEngineHubRepositoriesUrl() {
+fun RepositoryHandler.killNonEngineHubRepositories() {
+    val toRemove = mutableListOf<MavenArtifactRepository>()
     for (repo in this) {
         if (repo is MavenArtifactRepository && !ALLOWED_PREFIXES.any { repo.url.toString().startsWith(it) }) {
-            LOGGER.info("Replacing non-EngineHub repository: {}", repo.url)
-            repo.url = URI.create("https://maven.enginehub.org/repo/")
+            LOGGER.info("Removing non-EngineHub repository: {}", repo.url)
+            toRemove.add(repo)
         }
     }
+    toRemove.forEach { remove(it) }
 }
 
 fun RepositoryHandler.verifyEngineHubRepositories() {

diff --git a/worldedit-neoforge/build.gradle.kts b/worldedit-neoforge/build.gradle.kts
@@ -27,9 +27,14 @@ val apiClasspath = configurations.create("apiClasspath") {
 }
 
 repositories {
+    maven {
+        name = "EngineHub"
+        url = uri("https://maven.enginehub.org/repo/")
+    }
     mavenCentral()
+    killNonEngineHubRepositories()
     afterEvaluate {
-        replaceNonEngineHubRepositoriesUrl()
+        killNonEngineHubRepositories()
     }
 }
 

diff --git a/worldedit-sponge/build.gradle.kts b/worldedit-sponge/build.gradle.kts
@@ -19,17 +19,24 @@ commonJava {
 }
 
 minecraft {
+    injectRepositories(false)
     version(libs.versions.sponge.minecraft.get())
 }
 
 repositories {
+    maven {
+        name = "EngineHub"
+        url = uri("https://maven.enginehub.org/repo/")
+    }
     mavenCentral()
+    verifyEngineHubRepositories()
     afterEvaluate {
-        replaceNonEngineHubRepositoriesUrl()
+        verifyEngineHubRepositories()
     }
 }
 
 sponge {
+    injectRepositories(false)
     apiVersion(libs.versions.sponge.api.asProvider().get())
     license("GPL-3.0-or-later")
     plugin("worldedit") {