From 4be0b486008f24543ce55231a7da3696eaf07def Mon Sep 17 00:00:00 2001
From: "Lukas Rieger (Blue)" <github@bluecolored.de>
Date: Sat, 7 Dec 2024 12:24:55 +0100
Subject: [PATCH] Add branch to version if not master

---
 api                                    | 2 +-
 buildSrc/src/main/kotlin/versioning.kt | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/api b/api
index 9f338dabb..768daee3c 160000
--- a/api
+++ b/api
@@ -1 +1 @@
-Subproject commit 9f338dabb73ee8e195dba807db6c275b3c9e76a7
+Subproject commit 768daee3c4c80f7c1c2c3096241818c27c7b5fa2
diff --git a/buildSrc/src/main/kotlin/versioning.kt b/buildSrc/src/main/kotlin/versioning.kt
index b79ac65db..b329db7e1 100644
--- a/buildSrc/src/main/kotlin/versioning.kt
+++ b/buildSrc/src/main/kotlin/versioning.kt
@@ -15,7 +15,9 @@ fun Project.gitVersion(): String {
     val lastTag = if (runCommand("git tag", "").isEmpty()) "" else runCommand("git describe --tags --abbrev=0", "")
     val lastVersion = if (lastTag.isEmpty()) "0.0" else lastTag.substring(1) // remove the leading 'v'
     val commits = runCommand("git rev-list --count $lastTag..HEAD", "0")
+    val branch = runCommand("git branch --show-current")
     val gitVersion = lastVersion +
+            (if (branch == "master") "" else "-${branch.replace('/', '.')}") +
             (if (commits == "0") "" else "-$commits") +
             (if (gitClean()) "" else "-dirty")