Merge remote-tracking branch 'origin/master'

Anuken · Oct 14, 2024 · 950716c · 950716c
2 parents e2019fd + f12be51
commit 950716c
Show file tree

Hide file tree

Showing 3 changed files with 359 additions and 300 deletions.
diff --git a/build.gradle b/build.gradle
@@ -89,6 +89,10 @@ allprojects{
             return project.getProperties()["buildversion"]
         }
 
+        getCommitHash = {
+            return 'git rev-parse --verify --short HEAD'.execute().text.trim()
+        }
+
         getPackage = {
             return project.ext.mainClassName.substring(0, project.ext.mainClassName.indexOf("desktop") - 1)
         }
@@ -133,6 +137,10 @@ allprojects{
                 props["number"] = versionNumber
                 props["modifier"] = versionModifier
                 props["build"] = buildid
+                props["commitHash"] = "unknown"
+                if(project.hasProperty("showCommitHash")){
+                    props["commitHash"] = getCommitHash()
+                }
 
                 props.store(pfile.newWriter(), "Autogenerated file. Do not modify.")
             }