diff --git a/api b/api index 768daee3..67a7352c 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 768daee3c4c80f7c1c2c3096241818c27c7b5fa2 +Subproject commit 67a7352c672d054b9e6cd0e996a4fa92ba0c237e diff --git a/buildSrc/src/main/kotlin/versioning.kt b/buildSrc/src/main/kotlin/versioning.kt index b329db7e..3704bfc2 100644 --- a/buildSrc/src/main/kotlin/versioning.kt +++ b/buildSrc/src/main/kotlin/versioning.kt @@ -15,7 +15,7 @@ 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 branch = runCommand("git branch --show-current", "master") val gitVersion = lastVersion + (if (branch == "master") "" else "-${branch.replace('/', '.')}") + (if (commits == "0") "" else "-$commits") +