rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2284 from vector-im/feature/bma/versionCode

Browse Source 
Feature/bma/version code
This commit is contained in:
Benoit Marty 2020-10-22 22:03:05 +02:00 committed by GitHub
commit 83925322cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle
View File

@ -65,9 +65,8 @@ allprojects {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
// Warnings are potential errors, so stop ignoring them // Warnings are potential errors, so stop ignoring them
// You can override by passing `-PallWarningsAsErrors=false` in the command line // You can override by passing `-PallWarningsAsErrors=false` in the command line
kotlinOptions.allWarningsAsErrors = project.properties['allWarningsAsErrors']?.toBoolean() ?: true kotlinOptions.allWarningsAsErrors = project.getProperties().getOrDefault("allWarningsAsErrors", "true").toBoolean()
} }
} }
task clean(type: Delete) { task clean(type: Delete) {

11
vector/build.gradle
View File

@ -39,9 +39,9 @@ def generateVersionCodeFromVersionName() {
def getVersionCode() { def getVersionCode() {
if (gitBranchName() == "develop") { if (gitBranchName() == "develop") {
return generateVersionCodeFromTimestamp() * 10 return generateVersionCodeFromTimestamp()
} else { } else {
return generateVersionCodeFromVersionName() * 10 return generateVersionCodeFromVersionName()
} }
} }
@ -166,13 +166,14 @@ android {
} }
applicationVariants.all { variant -> applicationVariants.all { variant ->
// assign different version code for each output
def baseVariantVersion = variant.versionCode * 10
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
print "ABI " + output.getFilter(OutputFile.ABI) + " \tvariant.versionCode " + variant.versionCode
// See https://issuetracker.google.com/issues/171133218 // See https://issuetracker.google.com/issues/171133218
output.versionCodeOverride = variant.versionCode + baseAbiVersionCode output.versionCodeOverride = baseVariantVersion + baseAbiVersionCode
print " \t-> VersionCode = " + output.versionCodeOverride + "\n" print "ABI " + output.getFilter(OutputFile.ABI) + " \t-> VersionCode = " + output.versionCodeOverride + "\n"
} }
} }