Don't include snapshot commit hash in file name

booky10 · Jul 8, 2024 · b0fa4eb · b0fa4eb
1 parent f81730c
commit b0fa4eb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,12 +7,12 @@ val snapshot = true
 group = "com.github.retrooper"
 description = rootProject.name
 
-fun getVersionMeta(): String {
+fun getVersionMeta(includeHash: Boolean): String {
     if (!snapshot) {
         return ""
     }
     var commitHash = ""
-    if (file(".git").isDirectory) {
+    if (includeHash && file(".git").isDirectory) {
         val stdout = ByteArrayOutputStream()
         exec {
             commandLine("git", "rev-parse", "--short", "HEAD")
@@ -22,7 +22,8 @@ fun getVersionMeta(): String {
     }
     return "$commitHash-SNAPSHOT"
 }
-version = "$fullVersion${getVersionMeta()}"
+version = "$fullVersion${getVersionMeta(true)}"
+ext["versionNoHash"] = "$fullVersion${getVersionMeta(false)}"
 
 tasks {
     wrapper {
@@ -63,3 +64,9 @@ tasks {
 
     defaultTasks("build")
 }
+
+allprojects {
+    tasks.withType<Jar> {
+        archiveVersion = rootProject.ext["versionNoHash"] as String
+    }
+}
diff --git a/buildSrc/src/main/kotlin/packetevents.library-conventions.gradle.kts b/buildSrc/src/main/kotlin/packetevents.library-conventions.gradle.kts
@@ -54,7 +54,7 @@ publishing {
         create<MavenPublication>("shadow") {
             groupId = project.group as String
             artifactId = "packetevents-" + project.name
-            version = project.version as String
+            version = rootProject.ext["versionNoHash"] as String
 
             if (isShadow) {
                 artifact(project.tasks.withType<ShadowJar>().getByName("shadowJar").archiveFile)
@@ -149,4 +149,4 @@ val taskNames = gradle.startParameter.taskNames
 if (taskNames.any { it.contains("build") }
     && taskNames.any { it.contains("publish") }) {
     throw IllegalStateException("Cannot build and publish at the same time.")
-}
+}
diff --git a/buildSrc/src/main/kotlin/packetevents.shadow-conventions.gradle.kts b/buildSrc/src/main/kotlin/packetevents.shadow-conventions.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 tasks {
     shadowJar {
-        archiveFileName = "packetevents-${project.name}-${project.version}.jar"
+        archiveFileName = "packetevents-${project.name}-${rootProject.ext["versionNoHash"]}.jar"
         archiveClassifier = null
 
         relocate("net.kyori.adventure.text.serializer", "io.github.retrooper.packetevents.adventure.serializer")
@@ -45,4 +45,4 @@ fun DependencyFilter.exclude(dependency: ResolvedDependency) {
     dependency.children.forEach {
         exclude(it)
     }
-}
+}
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -63,7 +63,10 @@ tasks {
         }
     }
 
-    remapJar {
-        archiveBaseName.set("${rootProject.name}-fabric")
+    sequenceOf(remapJar, remapSourcesJar).forEach {
+        it {
+            archiveBaseName = "${rootProject.name}-fabric"
+            archiveVersion = rootProject.ext["versionNoHash"] as String
+        }
     }
-}
+}