mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-27 11:59:12 +03:00
Code Issues Projects Releases Packages Wiki Activity

Change the way versionCode is computed (#827)

Browse source
This commit is contained in:
Benoit Marty 2020-01-10 17:29:34 +01:00
parent 32d2daee3c
commit 03b5b098c7
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES.md
View file

@ -17,7 +17,7 @@ Translations 🗣:
- -
Build 🧱: Build 🧱:
- - Change the way versionCode is computed (#827)
Changes in RiotX 0.12.0 (2020-01-09) Changes in RiotX 0.12.0 (2020-01-09)
=================================================== ===================================================

16
vector/build.gradle
View file

@ -24,12 +24,16 @@ static def getGitTimestamp() {
} }
static def generateVersionCodeFromTimestamp() { static def generateVersionCodeFromTimestamp() {
// It's unix timestamp divided by 10: It's incremented by one every 10 seconds. // It's unix timestamp, minus timestamp of October 3rd 2018 (first commit date) divided by 100: It's incremented by one every 100 seconds.
return (getGitTimestamp() / 10).toInteger() // plus 20_000_000 for compatibility reason with the previous timestamp
// Note that the result will be multiplied by 10 when adding the digit for the arch
return ((getGitTimestamp() - 1_538_524_800 ) / 100).toInteger() + 20_000_000
} }
def generateVersionCodeFromVersionName() { def generateVersionCodeFromVersionName() {
return versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch // plus 4_000_000 for compatibility reason with the previous timestamp
// Note that the result will be multiplied by 10 when adding the digit for the arch
return (versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch) + 4_000_000
} }
def getVersionCode() { def getVersionCode() {
@ -77,8 +81,8 @@ project.android.buildTypes.all { buildType ->
] ]
} }
// map for the version codes // map for the version codes last digit
// x86 must have greater values than arm, see https://software.intel.com/en-us/android/articles/google-play-supports-cpu-architecture-filtering-for-multiple-apk // x86 must have greater values than arm
// 64 bits have greater value than 32 bits // 64 bits have greater value than 32 bits
ext.abiVersionCodes = ["armeabi-v7a": 1, "arm64-v8a": 2, "x86": 3, "x86_64": 4].withDefault { 0 } ext.abiVersionCodes = ["armeabi-v7a": 1, "arm64-v8a": 2, "x86": 3, "x86_64": 4].withDefault { 0 }
@ -144,7 +148,7 @@ 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 = baseAbiVersionCode * 10_000_000 + variant.versionCode output.versionCodeOverride = variant.versionCode * 10 + baseAbiVersionCode
} }
} }
} }