1
0
Fork 0

version name generator now counts only the 'v' tags and also takes into account beta versions

This commit is contained in:
Dimo Karaivanov 2022-11-29 13:56:21 +02:00
parent 5797e1bf4d
commit cfb9e18a76

View file

@ -46,15 +46,23 @@ def computeVersionCode = { ->
} }
def computeVersionName = { -> def computeVersionName = { ->
String tagsCount = execThing('git tag').split('\n').size() // major version
String lastTag = execThing('git describe --tags --abbrev=0') String versionTagsCount = execThing('git tag --list v*').split('\n').size()
String gitLogResult = execThing("git log $lastTag..HEAD --oneline") // minor version
String lastVersionTag = execThing('git describe --match v* --tags --abbrev=0')
String gitLogResult = execThing("git log $lastVersionTag..HEAD --oneline")
String commitsSinceLastTag = gitLogResult == '' ? "0" : gitLogResult.split('\n').size() String commitsSinceLastTag = gitLogResult == '' ? "0" : gitLogResult.split('\n').size()
// the commit we are building from
String currentHash = execThing('git log -1 --format=%h') String currentHash = execThing('git log -1 --format=%h')
return "$tagsCount.$commitsSinceLastTag ($currentHash)" // beta string, if this is a beta
String lastTagName = execThing('git describe --tags --abbrev=0')
String lastTagHash = execThing("git log -1 --format=%h $lastTagName")
String betaString = lastTagHash == currentHash && lastTagName.contains("beta") ? '-beta' : ''
return "$versionTagsCount.$commitsSinceLastTag$betaString ($currentHash)"
} }
android { android {