From 654c5313dea9c9c1d006fd642c8a81196bf7a08e Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 15 Jun 2018 11:31:00 +0200
Subject: [PATCH] reorder gradle "android" sub-blocks in standard order
https://developer.android.com/studio/build/build-variants
---
app/build.gradle | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 9236b55e8..6732075bc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,6 +22,12 @@ android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
+ defaultConfig {
+ versionCode 1003001
+ versionName getVersionName()
+ testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ }
+
buildTypes {
// use proguard on debug too since we have unknowingly broken
// release builds before.
@@ -32,6 +38,12 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), '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"
@@ -63,21 +75,6 @@ android {
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 {
unitTests {
includeAndroidResources = true