From 6347db9167334558ff1d6a2fb4bf39c7c7fc0366 Mon Sep 17 00:00:00 2001
From: alexcrea <42614139+alexcrea@users.noreply.github.com>
Date: Sat, 14 Jun 2025 14:29:52 +0200
Subject: [PATCH] add small hash to actions name

---
 .github/workflows/gradle.yml | 16 +++++++---------
 build.gradle.kts             | 22 ++++++----------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 48f4c21..92d98e5 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -45,12 +45,10 @@ jobs:
         run: chmod +x ./gradlew
 
       - name: Get small commit hash
-        run: echo "small_commit_hash=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_ENV
+        run: echo "SMALL_COMMIT_HASH=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_ENV
 
       - name: Build with Gradle Wrapper
         run: ./gradlew build --parallel
-        env:
-          SMALL_COMMIT_HASH: ${{ env.small_commit_hash }}
 
       # only submit dependency on push
       - name: Generate and submit dependency graph
@@ -65,21 +63,21 @@ jobs:
           ONLINE_JAR_PATH=$(ls build/libs/CustomAnvil-*.jar | grep -v "offline") 
           OFFLINE_JAR_PATH=$(ls build/libs/CustomAnvil-*-offline.jar)
           
-          echo "online_jar_name=$(basename $ONLINE_JAR_PATH)" >> $GITHUB_ENV
-          echo "offline_jar_name=$(basename $OFFLINE_JAR_PATH)" >> $GITHUB_ENV
+          echo "ONLINE_JAR_NAME=$(basename $ONLINE_JAR_PATH)" >> $GITHUB_ENV
+          echo "OFFLINE_JAR_NAME=$(basename $OFFLINE_JAR_PATH)" >> $GITHUB_ENV
 
       # upload the named jars
       - name: Upload online JAR artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.online_jar_name }}
-          path: build/libs/${{ env.online_jar_name }}
+          name: ${{ env.ONLINE_JAR_NAME }}
+          path: build/libs/${{ env.ONLINE_JAR_NAME }}
 
       - name: Upload offline JAR file
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.offline_jar_name }}
-          path: build/libs/${{ env.offline_jar_name }}
+          name: ${{ env.OFFLINE_JAR_NAME }}
+          path: build/libs/${{ env.OFFLINE_JAR_NAME }}
 
       - name: Summarize tests results
         uses: jeantessier/test-summary-action@v1
diff --git a/build.gradle.kts b/build.gradle.kts
index a7d3617..b9f1d69 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,7 +19,7 @@ group = "xyz.alexcrea"
 version = "1.11.3"
 
 val effectiveVersion = "$version" +
-        { (if (System.getenv("SMALL_COMMIT_HASH") != null) "-${System.getenv("SMALL_COMMIT_HASH")!!}" else "") }
+        (if (System.getenv("SMALL_COMMIT_HASH") != null) "-dev-${System.getenv("SMALL_COMMIT_HASH")!!}" else "")
 
 repositories {
     // EcoEnchants
@@ -134,24 +134,13 @@ allprojects {
 
 }
 
-// Fat-jar builder
-val fatJar = tasks.register<Jar>("fatJar") {
-    manifest {
-        attributes.apply { put("Main-Class", "io.delilaheve.CustomAnvil") }
-    }
-
-    archiveFileName.set("${rootProject.name}-${effectiveVersion}.jar")
-    exclude("META-INF/*.RSA", "META-INF/*.SF", "META-INF/*.DSA")
-    duplicatesStrategy = DuplicatesStrategy.WARN
-    from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
-    with(tasks.jar.get() as CopySpec)
-}
-
 tasks {
+
     // Online jar (use of libraries)
     shadowJar {
         // No suffix for this jar
-        archiveClassifier.set("")
+        val name = "${rootProject.name}-${effectiveVersion}.jar"
+        archiveFileName.set(name)
 
         // Exclude kotlin std and its annotation
         exclude("**/kotlin-stdlib*.jar")
@@ -181,7 +170,8 @@ tasks {
 
         // Add custom anvil compiled
         ::class, fun ShadowJar.() {
-            archiveClassifier.set("offline")
+            val name = "${rootProject.name}-${effectiveVersion}-offline.jar"
+            archiveFileName.set(name)
 
             // Shadow necessary dependency
             relocate("com.github.stefvanschie.inventoryframework", "xyz.alexcrea.inventoryframework")