Move publishing to a convention plugin, publish fabric too (Noxcrew#22)

AsoDesu · Aug 11, 2023 · 6f0c621 · 6f0c621
1 parent 0a9c961
commit 6f0c621
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 23 deletions.
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -1,6 +1,10 @@
 plugins {
     id("java-library")
-    id("maven-publish")
+    id("noxesium.publishing")
+}
+
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 }
 
 repositories {
@@ -10,25 +14,3 @@ repositories {
 dependencies {
     implementation("org.jetbrains:annotations:24.0.0")
 }
-
-publishing {
-    repositories {
-        maven {
-            name = "noxcrew-public"
-            url = uri("https://maven.noxcrew.com/public")
-            credentials {
-                username = System.getenv("NOXCREW_MAVEN_PUBLIC_USERNAME")
-                password = System.getenv("NOXCREW_MAVEN_PUBLIC_PASSWORD")
-            }
-            authentication {
-                create<BasicAuthentication>("basic")
-            }
-        }
-    }
-    publications {
-        create<MavenPublication>("maven") {
-            version = "${property("mod_version")}"
-            from(components["java"])
-        }
-    }
-}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+}
diff --git a/buildSrc/src/main/kotlin/noxesium.publishing.gradle.kts b/buildSrc/src/main/kotlin/noxesium.publishing.gradle.kts
@@ -0,0 +1,25 @@
+plugins {
+    `maven-publish`
+}
+
+publishing {
+    repositories {
+        maven {
+            name = "noxcrew-public"
+            url = uri("https://maven.noxcrew.com/public")
+            credentials {
+                username = System.getenv("NOXCREW_MAVEN_PUBLIC_USERNAME")
+                password = System.getenv("NOXCREW_MAVEN_PUBLIC_PASSWORD")
+            }
+            authentication {
+                create<BasicAuthentication>("basic")
+            }
+        }
+    }
+    publications {
+        create<MavenPublication>("maven") {
+            version = "${property("mod_version")}"
+            from(components["java"])
+        }
+    }
+}
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     id("fabric-loom") version "1.3-SNAPSHOT"
+    id("noxesium.publishing")
 }
 
 repositories {