Stop using conventions for java/version

CompactMods · Dec 14, 2024 · 22cf245 · 22cf245
1 parent 4de8ce7
commit 22cf245
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 44 deletions.
diff --git a/buildSrc/src/main/kotlin/gander-convention.gradle.kts b/buildSrc/src/main/kotlin/gander-convention.gradle.kts
@@ -1,10 +1,6 @@
 import dev.compactmachines.GanderConstants
 import org.slf4j.event.Level
 
-var envVersion: String = System.getenv("VERSION") ?: "9.9.9"
-if (envVersion.startsWith("v"))
-    envVersion = envVersion.trimStart('v')
-
 plugins {
     id("java-library")
     id("idea")
@@ -17,13 +13,7 @@ plugins {
 // pulling in version data from GanderConstants since version catalogs
 // from the main outer project are not accessible here
 
-base {
-    archivesName = project.name
-    group = "dev.compactmods.gander"
-    version = envVersion
-
-    libsDirectory.convention(rootProject.layout.projectDirectory.dir("libs/${project.name}"))
-}
+base.libsDirectory.convention(rootProject.layout.projectDirectory.dir("libs/${project.name}"))
 
 idea.module {
     if(!GanderConstants.IS_CI) {
@@ -93,21 +83,3 @@ javaToolchains.compilerFor {
     languageVersion.convention(GanderConstants.JAVA_VERSION)
     vendor.convention(GanderConstants.JAVA_VENDOR)
 }
-
-val PACKAGES_URL = System.getenv("GH_PKG_URL") ?: "https://maven.pkg.github.com/compactmods/gander"
-publishing {
-    publications.register<MavenPublication>(project.name) {
-        from(components.getByName("java"))
-    }
-
-    repositories {
-        // GitHub Packages
-        maven(PACKAGES_URL) {
-            name = "GitHubPackages"
-            credentials {
-                username = System.getenv("GITHUB_ACTOR")
-                password = System.getenv("GITHUB_TOKEN")
-            }
-        }
-    }
-}
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -1,5 +1,31 @@
-val isRelease: Boolean = (System.getenv("RELEASE") ?: "false").equals("true", true)
+var envVersion: String = System.getenv("VERSION") ?: "9.9.9"
+if (envVersion.startsWith("v"))
+    envVersion = envVersion.trimStart('v')
 
 plugins {
     id("gander-convention")
 }
+
+base {
+    archivesName = project.name
+    group = "dev.compactmods.gander"
+    version = envVersion
+}
+
+val PACKAGES_URL = System.getenv("GH_PKG_URL") ?: "https://maven.pkg.github.com/compactmods/gander"
+publishing {
+    publications.register<MavenPublication>(project.name) {
+        from(components.getByName("java"))
+    }
+
+    repositories {
+        // GitHub Packages
+        maven(PACKAGES_URL) {
+            name = "GitHubPackages"
+            credentials {
+                username = System.getenv("GITHUB_ACTOR")
+                password = System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+}
diff --git a/levels/build.gradle.kts b/levels/build.gradle.kts
@@ -1,12 +1,31 @@
+var envVersion: String = System.getenv("VERSION") ?: "9.9.9"
+if (envVersion.startsWith("v"))
+    envVersion = envVersion.trimStart('v')
+
 plugins {
     id("gander-convention")
 }
 
-// simply exists to apply the module convention script
-// sets up MDG workspace and includes manifest data from resources dir
-// additional setup specific to this module may be applied here
+base {
+    archivesName = project.name
+    group = "dev.compactmods.gander"
+    version = envVersion
+}
+
+val PACKAGES_URL = System.getenv("GH_PKG_URL") ?: "https://maven.pkg.github.com/compactmods/gander"
+publishing {
+    publications.register<MavenPublication>(project.name) {
+        from(components.getByName("java"))
+    }
 
-//mixin {
-//    add(sourceSets[SourceSet.MAIN_SOURCE_SET_NAME], "gander_levels.mixins.json")
-//    config("gander_levels.mixins.json")
-//}
+    repositories {
+        // GitHub Packages
+        maven(PACKAGES_URL) {
+            name = "GitHubPackages"
+            credentials {
+                username = System.getenv("GITHUB_ACTOR")
+                password = System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+}
diff --git a/rendering/build.gradle.kts b/rendering/build.gradle.kts
@@ -1,12 +1,31 @@
+var envVersion: String = System.getenv("VERSION") ?: "9.9.9"
+if (envVersion.startsWith("v"))
+    envVersion = envVersion.trimStart('v')
+
 plugins {
     id("gander-convention")
 }
 
-// simply exists to apply the module convention script
-// sets up MDG workspace and includes manifest data from resources dir
-// additional setup specific to this module may be applied here
+base {
+    archivesName = project.name
+    group = "dev.compactmods.gander"
+    version = envVersion
+}
+
+val PACKAGES_URL = System.getenv("GH_PKG_URL") ?: "https://maven.pkg.github.com/compactmods/gander"
+publishing {
+    publications.register<MavenPublication>(project.name) {
+        from(components.getByName("java"))
+    }
 
-//mixin {
-//    add(sourceSets[SourceSet.MAIN_SOURCE_SET_NAME], "gander_render.mixins.json")
-//    config("gander_render.mixins.json")
-//}
+    repositories {
+        // GitHub Packages
+        maven(PACKAGES_URL) {
+            name = "GitHubPackages"
+            credentials {
+                username = System.getenv("GITHUB_ACTOR")
+                password = System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+}
diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
@@ -1,8 +1,36 @@
+var envVersion: String = System.getenv("VERSION") ?: "9.9.9"
+if (envVersion.startsWith("v"))
+    envVersion = envVersion.trimStart('v')
+
 plugins {
     id("gander-convention")
 }
 
+base {
+    archivesName = project.name
+    group = "dev.compactmods.gander"
+    version = envVersion
+}
+
 dependencies {
     implementation(project(":core"))
     implementation(project(":rendering"))
 }
+
+val PACKAGES_URL = System.getenv("GH_PKG_URL") ?: "https://maven.pkg.github.com/compactmods/gander"
+publishing {
+    publications.register<MavenPublication>(project.name) {
+        from(components.getByName("java"))
+    }
+
+    repositories {
+        // GitHub Packages
+        maven(PACKAGES_URL) {
+            name = "GitHubPackages"
+            credentials {
+                username = System.getenv("GITHUB_ACTOR")
+                password = System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+}