Merge pull request #59 from EraTiem-Network/next

Gradle 8.8 + maven repos via yaml

Author: Motzkiste

.gitignore

@@ -6,6 +6,8 @@ build/
 !**/src/main/**/run/
 !**/src/test/**/run/
 gradle.properties
+maven-repos.yml
+.kotlin
 
 ### Files with secrets and private paths ###
 .idea/runConfigurations

build.gradle.kts

@@ -1,6 +1,8 @@
+import com.charleskorn.kaml.Yaml
+import com.charleskorn.kaml.decodeFromStream
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.gradle.kotlin.dsl.support.uppercaseFirstChar
 import java.lang.System.getProperty
+import java.lang.System.getenv
 import java.net.URI
 
 group = "net.eratiem"
@@ -40,33 +42,37 @@ subprojects {
   }
 }
 
+// ###############
+// # Maven Repos #
+// ###############
+buildscript {
+  dependencies {
+    classpath(libs.kotlinx.serialization.core)
+    classpath(libs.kaml)
+  }
+  repositories.mavenCentral()
+}
+
+val repoList = File("maven-repos.yml").takeIf(File::exists)?.inputStream()?.use { stream ->
+  Yaml.default.decodeFromStream<List<Map<String, String?>>>(stream).map {
+    MavenRepo(
+      it["name"]!!,
+      URI(it["url"]!!),
+      it["username"],
+      it["password"],
+      it["publish"]?.toBooleanStrictOrNull() ?: false
+    )
+  }
+}
+
 
 // ##############
 // # Publishing #
 // ##############
 
 publishing {
   repositories {
-    val repoNames = System.getProperties().filterKeys { (it as String).startsWith("project.publish", true) }
-      .map { (it.key as String).removePrefix("project.publish.").substringBefore(".") }.toSet()
-
-    repoNames.forEach {
-      maven {
-        name = it.uppercaseFirstChar()
-        url = uri(getProperty("project.publish.$it.url"))
-
-        getProperty("project.publish.$it.auth-type")?.let { authType ->
-          when (authType) {
-            else -> {
-              credentials {
-                username = "${properties["project.publish.$it.username"]}"
-                password = "${properties["project.publish.$it.access-token"]}"
-              }
-            }
-          }
-        }
-      }
-    }
+    repoList?.filter { it.publish }?.forEach { createRepository(it) }
   }
 }
 
@@ -81,10 +87,7 @@ allprojects {
   }
 
   repositories {
-    maven {
-      name = "Bit-Build | Artifactory"
-      url = URI("https://artifactory.bit-build.de/artifactory/public")
-    }
+    repoList?.forEach { createRepository(it) }
   }
 
   tasks {
@@ -136,4 +139,30 @@ fun <T> T.applyIf(condition: Boolean, block: T.() -> Unit) =
     apply { block() }
   } else {
     this
-  }
+  }
+
+fun RepositoryHandler.createRepository(repo: MavenRepo) {
+  maven {
+    name = repo.name.replace(Regex("[^A-Za-z0-9_\\-. ]"), "").replace(Regex("\\s+"), "_")
+    url = repo.url
+
+    val envName = name.replace(Regex("\\."), "").uppercase()
+    val user = repo.username ?: getenv("${envName}_USERNAME")
+    val pass = repo.password ?: getenv("${envName}_PASSWORD")
+
+    if (!user.isNullOrBlank() || !pass.isNullOrBlank()) {
+      credentials {
+        if (!user.isNullOrBlank()) username = user
+        if (!pass.isNullOrBlank()) password = pass
+      }
+    }
+  }
+}
+
+data class MavenRepo(
+  val name: String,
+  val url: URI,
+  val username: String? = null,
+  val password: String? = null,
+  val publish: Boolean = false
+)

gradle/libs.versions.toml

@@ -1,5 +1,6 @@
 [versions]
 kotlin = "2.0.0"
+kotlinx-serialization = "1.6.3"
 shadow = "8.1.1"
 run = "2.3.0"
 paperweight = "1.7.1"
@@ -16,6 +17,8 @@ plugin-folia = "1.20"
 [libraries]
 kotlin-gradleplugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
+kotlinx-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
+kaml = { group = "com.charleskorn.kaml", name = "kaml", version = "0.59.0" }
 
 # Minecraft Software Dependencies
 minecraft-server-folia = { group = "dev.folia", name = "folia-api", version.ref = "folia" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,14 @@
+- name: EmpireRP | Public
+  url: https://nexus.empirerp.de/repository/public/
+  username: motzkiste
+  password: 5,W5dVDeD-4nN!}_?ibRtNMr;^7=pZ]Y,;UV<sHQ*:\;"#N{MU`m-533yz<~?L<i
+- name: EmpireRP | Snapshots
+  url: https://nexus.empirerp.de/repository/empirerp-snapshots/
+  username: motzkiste
+  password: 5,W5dVDeD-4nN!}_?ibRtNMr;^7=pZ]Y,;UV<sHQ*:\;"#N{MU`m-533yz<~?L<i
+  publish: true
+- name: EmpireRP | Releases
+  url: https://nexus.empirerp.de/repository/empirerp-releases/
+  username: motzkiste
+  password: 5,W5dVDeD-4nN!}_?ibRtNMr;^7=pZ]Y,;UV<sHQ*:\;"#N{MU`m-533yz<~?L<i
+  publish: true