Merge branch 'master' into dependency-injection

This commit is contained in:
Vivek Maskara 2017-12-04 02:17:16 +05:30 committed by GitHub
commit 52b52c4895
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 186 additions and 89 deletions

View file

@ -83,7 +83,6 @@ android {
defaultConfig {
applicationId 'fr.free.nrw.commons'
versionCode 76
versionName '2.6.1'
setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
@ -104,6 +103,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
debug {
applicationIdSuffix ".debug"
testCoverageEnabled true
versionNameSuffix "-debug-" + getBranchName() + "~" + getBuildVersion()
}