Configure bom and catalog publishing

Sinytra · Jul 21, 2024 · b78d284 · b78d284
1 parent 84a7e15
commit b78d284
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,6 @@ import net.fabricmc.loom.build.nesting.JarNester
 import net.fabricmc.loom.util.Constants
 import org.apache.commons.codec.digest.DigestUtils
 import org.eclipse.jgit.api.Git
-import java.util.*
 
 plugins {
     java
@@ -58,15 +57,32 @@ println("Version: $version")
 allprojects {
     apply(plugin = "maven-publish")
 
+    publishing {
+        repositories {
+            val env = System.getenv()
+            if (env["MAVEN_URL"] != null) {
+                repositories.maven {
+                    url = uri(env["MAVEN_URL"] as String)
+                    if (env["MAVEN_USERNAME"] != null) {
+                        credentials {
+                            username = env["MAVEN_USERNAME"]
+                            password = env["MAVEN_PASSWORD"]
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    group = "org.sinytra.forgified-fabric-api"
+
     if (project.name in META_PROJECTS) {
         return@allprojects
     }
 
     apply(plugin = "java-library")
     apply(plugin = "dev.architectury.loom")
 
-    group = "org.sinytra.forgified-fabric-api"
-
     java {
         toolchain.languageVersion.set(JavaLanguageVersion.of(21))
         withSourcesJar()
@@ -131,7 +147,7 @@ tasks {
             )
         }
     }
-    
+
     withType<JavaCompile> {
         options.release = 21
     }
@@ -180,22 +196,8 @@ allprojects {
                 from(components["java"])
             }
         }
-        repositories {
-            val env = System.getenv()
-            if (env["MAVEN_URL"] != null) {
-                repositories.maven {
-                    url = uri(env["MAVEN_URL"] as String)
-                    if (env["MAVEN_USERNAME"] != null) {
-                        credentials {
-                            username = env["MAVEN_USERNAME"]
-                            password = env["MAVEN_PASSWORD"]
-                        }
-                    }
-                }
-            }
-        }
     }
-    
+
     if (project != rootProject) {
         configurations {
             apiElements {

diff --git a/fabric-api-catalog/build.gradle b/fabric-api-catalog/build.gradle
@@ -50,7 +50,7 @@ def doConfigureCatalog() {
 
 		catalog {
 			versionCatalog {
-				library(catalogName, "net.fabricmc.fabric-api:${proj.name}:${proj.version}")
+				library(catalogName, "org.sinytra.forgified-fabric-api:${proj.name}:${proj.version}")
 			}
 		}
 	}