github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2024-11-24 10:54:36 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Gradle] Fix showing correct app version on debug builds.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2021-10-29 17:32:05 +02:00
parent 23bd9b8e05
commit 113ecc0ef1
No known key found for this signature in database
GPG Key ID: 70CB8A85BA1633CB
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -56,7 +56,7 @@ android {
flavorDimensions "platform" flavorDimensions "platform"
productFlavors { productFlavors {
main { main {
versionName gitInfo.versionHuman versionName "${release.versionName}-${gitInfo.versionSuffix}"
} }
official {} official {}
play {} play {}

19
app/git-info.gradle
View File

@ -97,18 +97,17 @@ private def buildGitInfo() {
def tag = getLastTag(repo, git, head) def tag = getLastTag(repo, git, head)
def tagName = tag[1] def tagName = tag[1]
def tagRevCount = tag[2] def tagRevCount = tag[2]
def versionName = tagName.replace("v", "")
def result = [ def result = [
hash : head.objectId.name, hash : head.objectId.name,
branch : repo.branch, branch : repo.branch,
dirty : dirty, dirty : dirty,
remotes : remotes, remotes : remotes,
unstaged : status.uncommittedChanges.join("; "), unstaged : status.uncommittedChanges.join("; "),
tag : tagName, tag : tagName,
revCount : tagRevCount, revCount : tagRevCount,
version : """$tagName-$tagRevCount-g${head.objectId.name.substring(0, 8)}""" + (dirty ? ".dirty" : ""), version : """$tagName-$tagRevCount-g${head.objectId.name.substring(0, 8)}""" + (dirty ? ".dirty" : ""),
versionHuman: """$versionName-${repo.branch.replace("/", "_")}""" + (dirty ? ".dirty" : "") versionSuffix : """${repo.branch.replace("/", "_")}""" + (dirty ? ".dirty" : "")
] ]
return result return result
} }