Merge remote-tracking branch 'refs/remotes/commons-app/master'

# Conflicts:
#	app/build.gradle
This commit is contained in:
misaochan 2017-11-27 20:33:04 +10:00
commit e0fc100cdd
16 changed files with 62 additions and 4 deletions

View file

@ -1,3 +1,4 @@
apply from: '../gitutils.gradle'
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
@ -76,8 +77,11 @@ android {
defaultConfig {
applicationId 'fr.free.nrw.commons'
versionCode 75
versionName '2.6.0'
setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
minSdkVersion project.minSdkVersion
targetSdkVersion project.targetSdkVersion
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@ -95,6 +99,7 @@ android {
}
debug {
testCoverageEnabled true
versionNameSuffix "-debug-" + getBranchName() + "~" + getBuildVersion()
}
}