filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/bma/versionCode' into develop

This commit is contained in:
Benoit Marty 2020-10-19 12:31:35 +02:00
parent 1b7158a61d a59c92f55a
commit c05147a019
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vector/build.gradle
View File

@ -39,9 +39,9 @@ def generateVersionCodeFromVersionName() {
def getVersionCode() { def getVersionCode() {
if (gitBranchName() == "develop") { if (gitBranchName() == "develop") {
return generateVersionCodeFromTimestamp() return generateVersionCodeFromTimestamp() * 10
} else { } else {
return generateVersionCodeFromVersionName() return generateVersionCodeFromVersionName() * 10
} }
} }
@ -169,7 +169,10 @@ android {
variant.outputs.each { output -> variant.outputs.each { output ->
def baseAbiVersionCode = project.ext.abiVersionCodes.get(output.getFilter(OutputFile.ABI)) def baseAbiVersionCode = project.ext.abiVersionCodes.get(output.getFilter(OutputFile.ABI))
// Known limitation: it does not modify the value in the BuildConfig.java generated file // Known limitation: it does not modify the value in the BuildConfig.java generated file
output.versionCodeOverride = variant.versionCode * 10 + baseAbiVersionCode print "ABI " + output.getFilter(OutputFile.ABI) + " \tvariant.versionCode " + variant.versionCode
// See https://issuetracker.google.com/issues/171133218
output.versionCodeOverride = variant.versionCode + baseAbiVersionCode
print " \t-> VersionCode = " + output.versionCodeOverride + "\n"
} }
} }