diff --git a/app/build.gradle b/app/build.gradle index 66dec0c2..ecf9159d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ android { flavorDimensions "platform" productFlavors { main { - versionName gitInfo.versionHuman + versionName "${release.versionName}-${gitInfo.versionSuffix}" } official {} play {} diff --git a/app/git-info.gradle b/app/git-info.gradle index 2ddd8c2d..3577f668 100644 --- a/app/git-info.gradle +++ b/app/git-info.gradle @@ -97,18 +97,17 @@ private def buildGitInfo() { def tag = getLastTag(repo, git, head) def tagName = tag[1] def tagRevCount = tag[2] - def versionName = tagName.replace("v", "") def result = [ - hash : head.objectId.name, - branch : repo.branch, - dirty : dirty, - remotes : remotes, - unstaged : status.uncommittedChanges.join("; "), - tag : tagName, - revCount : tagRevCount, - version : """$tagName-$tagRevCount-g${head.objectId.name.substring(0, 8)}""" + (dirty ? ".dirty" : ""), - versionHuman: """$versionName-${repo.branch.replace("/", "_")}""" + (dirty ? ".dirty" : "") + hash : head.objectId.name, + branch : repo.branch, + dirty : dirty, + remotes : remotes, + unstaged : status.uncommittedChanges.join("; "), + tag : tagName, + revCount : tagRevCount, + version : """$tagName-$tagRevCount-g${head.objectId.name.substring(0, 8)}""" + (dirty ? ".dirty" : ""), + versionSuffix : """${repo.branch.replace("/", "_")}""" + (dirty ? ".dirty" : "") ] return result }