reorder gradle "android" sub-blocks in standard order
https://developer.android.com/studio/build/build-variants
This commit is contained in:
parent
91b070675d
commit
654c5313de
@ -22,6 +22,12 @@ android {
|
|||||||
compileSdkVersion 27
|
compileSdkVersion 27
|
||||||
buildToolsVersion '27.0.3'
|
buildToolsVersion '27.0.3'
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
versionCode 1003001
|
||||||
|
versionName getVersionName()
|
||||||
|
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||||
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
// use proguard on debug too since we have unknowingly broken
|
// use proguard on debug too since we have unknowingly broken
|
||||||
// release builds before.
|
// release builds before.
|
||||||
@ -32,6 +38,12 @@ android {
|
|||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro', 'src/androidTest/proguard-rules.pro'
|
testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro', 'src/androidTest/proguard-rules.pro'
|
||||||
}
|
}
|
||||||
|
debug {
|
||||||
|
applicationIdSuffix ".debug"
|
||||||
|
resValue "string", "applicationId", fullApplicationId + applicationIdSuffix
|
||||||
|
versionNameSuffix "-debug"
|
||||||
|
println 'buildTypes.debug defaultConfig.versionCode ' + defaultConfig.versionCode
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
flavorDimensions "base"
|
flavorDimensions "base"
|
||||||
@ -63,21 +75,6 @@ android {
|
|||||||
preDexLibraries = preDexEnabled && !isCi
|
preDexLibraries = preDexEnabled && !isCi
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultConfig {
|
|
||||||
versionCode 1003001
|
|
||||||
versionName getVersionName()
|
|
||||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
|
||||||
}
|
|
||||||
|
|
||||||
buildTypes {
|
|
||||||
debug {
|
|
||||||
applicationIdSuffix ".debug"
|
|
||||||
resValue "string", "applicationId", fullApplicationId + applicationIdSuffix
|
|
||||||
versionNameSuffix "-debug"
|
|
||||||
println 'buildTypes.debug defaultConfig.versionCode ' + defaultConfig.versionCode
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
testOptions {
|
testOptions {
|
||||||
unitTests {
|
unitTests {
|
||||||
includeAndroidResources = true
|
includeAndroidResources = true
|
||||||
|
Loading…
x
Reference in New Issue
Block a user