From 2e684dd561646fc27aa9747bc9bcabe9f7a97b74 Mon Sep 17 00:00:00 2001
From: Bram <bram@bramdekker.com>
Date: Mon, 8 Jul 2024 09:54:11 +0200
Subject: [PATCH] Added: Current Commit Hash (Thanks Booky)

---
 build.gradle.kts                              | 22 ++++++++++++++++++-
 .../tofaa/entitylib/version/ELVersionTask.kt  |  2 +-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 22d7467..177f4d3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,27 @@
+import java.io.ByteArrayOutputStream
+
 plugins {
     entitylib.`library-conventions`
 }
 
 group = "me.tofaa.entitylib"
 description = rootProject.name
-version = "2.4.1-SNAPSHOT"
+val fullVersion = "2.4.1"
+val snapshot = true
+
+fun getVersionMeta(): String {
+    if (!snapshot) {
+        return ""
+    }
+    var commitHash = ""
+    if (file(".git").isDirectory) {
+        val stdout = ByteArrayOutputStream()
+        exec {
+            commandLine("git", "rev-parse", "--short", "HEAD")
+            standardOutput = stdout
+        }
+        commitHash = "+${stdout.toString().trim()}"
+    }
+    return "$commitHash-SNAPSHOT"
+}
+version = "$fullVersion${getVersionMeta()}"
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/me/tofaa/entitylib/version/ELVersionTask.kt b/buildSrc/src/main/kotlin/me/tofaa/entitylib/version/ELVersionTask.kt
index e49c612..c01ef12 100644
--- a/buildSrc/src/main/kotlin/me/tofaa/entitylib/version/ELVersionTask.kt
+++ b/buildSrc/src/main/kotlin/me/tofaa/entitylib/version/ELVersionTask.kt
@@ -63,7 +63,7 @@ abstract class ELVersionTask : DefaultTask() {
         val snapShot: Boolean
     ) {
         companion object {
-            private val REGEX = Regex("""(\d+)\.(\d+)\.(\d+)(-SNAPSHOT)?""")
+            private val REGEX = Regex("""(\d+)\.(\d+)\.(\d+)(?:\+[0-9a-f]+)?(-SNAPSHOT)?""")
 
             fun fromString(version: String): Version {
                 val match = REGEX.matchEntire(version) ?: throw IllegalArgumentException("Invalid version: $version")