1.7.3: Fix up the KordEx repo entries

Author: gdude2002

.idea/kotlinc.xml

@@ -0,0 +1,9 @@
+# Gradle Plugins 1.7.3
+
+This version includes a quick enhancement for the KordEx plugin.
+
+## KordEx Plugin
+
+- Update the default repositories.
+  - The plugin now adds the minimum repositories required, rather than duplicating them unnecessarily.
+  - The plugin now adds filters to the KordEx repositories it defines, preventing Gradle from requesting artifacts it won't ever find there.

changes/1.7.3.md

@@ -3,4 +3,4 @@ kotlin.incremental=true
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1024m
 org.gradle.parallel=true
 
-projectVersion=1.7.2
+projectVersion=1.7.3

gradle.properties

@@ -166,24 +166,40 @@ class KordExPlugin @Inject constructor(
 		target.repositories.google()
 		target.repositories.mavenCentral()
 
-		// Reposilite: Resolves and stores mirrored repos.
-		target.repo(KORDEX_RELEASES_REPOSILITE)
-		target.repo(KORDEX_SNAPSHOTS_REPOSILITE)
-		target.repo(KORDEX_MIRROR_REPOSILITE)
+		target.repo("KordEx (Releases, R2)", KORDEX_RELEASES) {
+			content {
+				includeGroupAndSubgroups("com.kotlindiscord")
+				includeGroupAndSubgroups("dev.kordex")
+			}
+		}
+
+		target.repo("KordEx (Snapshots, R2)", KORDEX_SNAPSHOTS) {
+			content {
+				includeGroupAndSubgroups("com.kotlindiscord")
+				includeGroupAndSubgroups("dev.kordex")
+			}
+		}
 
-		// Cloudflare R2 domains: Useful when Reposilite is down.
-		target.repo(KORDEX_RELEASES)
-		target.repo(KORDEX_SNAPSHOTS)
-		target.repo(KORDEX_MIRROR)
+		target.repo("KordEx (Mirror, Reposilite)", KORDEX_MIRROR_REPOSILITE) {
+			content {
+				includeGroupAndSubgroups("dev.kord")
+			}
+		}
+
+		target.repo("KordEx (Mirror, R2)", KORDEX_MIRROR) {
+			content {
+				includeGroupAndSubgroups("dev.kord")
+			}
+		}
 
 		val modules = extension.modules.get().normalizeModules(kordExVersion, problems.reporter, log = false)
 
 		if (MAPPINGS_V1 in modules || MAPPINGS_V2 in modules) {
-			target.repo("https://maven.fabricmc.net")
-			target.repo("https://maven.quiltmc.org/repository/release")
-			target.repo("https://maven.quiltmc.org/repository/snapshot")
-			target.repo("https://maven.shedaniel.me")
-			target.repo("https://jitpack.io")
+			target.repo("FabricMC", "https://maven.fabricmc.net")
+			target.repo("QuiltMC (Releases)", "https://maven.quiltmc.org/repository/release")
+			target.repo("QuiltMC (Snapshots)", "https://maven.quiltmc.org/repository/snapshot")
+			target.repo("Shedaniel", "https://maven.shedaniel.me")
+			target.repo("Jitpack", "https://jitpack.io")
 		}
 	}
 

kordex/src/main/kotlin/dev/kordex/gradle/plugins/kordex/KordExPlugin.kt

@@ -7,11 +7,20 @@
 package dev.kordex.gradle.plugins.kordex.base
 
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.maven
+import org.gradle.api.artifacts.repositories.MavenArtifactRepository
 import org.gradle.kotlin.dsl.repositories
 
-internal fun Project.repo(url: String) {
+internal fun Project.repo(
+	repoName: String,
+	repoUrl: String,
+	body:  MavenArtifactRepository.() -> Unit = {}
+) {
 	repositories {
-		maven(url)
+		maven {
+			name = repoName
+			url = uri(repoUrl)
+
+			body(this)
+		}
 	}
 }

kordex/src/main/kotlin/dev/kordex/gradle/plugins/kordex/base/_Repositories.kt

@@ -1,6 +1,6 @@
 pluginManagement {
 	plugins {
-		val pluginVersion = "1.7.2"
+		val pluginVersion = "1.7.3"
 
 		kotlin("jvm") version "2.1.21"