Merge remote-tracking branch 'upstream/develop' into auto_download_12_hour_option_2685

1 files changed, 29 insertions, 28 deletions

diff --git a/app/build.gradle b/app/build.gradle
index a79ad180e..466d36e56 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,35 +1,24 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-
-apply plugin: "com.android.application"
-apply plugin: 'com.github.triplet.play'
-apply plugin: 'com.getkeepsafe.dexcount'
-
-repositories {
-    maven { url "https://jitpack.io" }
-    mavenCentral()
-}
-
 buildscript {
     repositories {
-       jcenter()
+        jcenter()
     }
     dependencies {
-        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.5'
     }
 }
 
-def getMyVersionName() {
-    def parsedManifestXml = (new XmlSlurper())
-            .parse("${projectDir}/src/main/AndroidManifest.xml")
-            .declareNamespace(android: "http://schemas.android.com/apk/res/android")
-    return parsedManifestXml."@android:versionName"
+plugins {
+    id('com.github.triplet.play') version '2.0.0'
 }
 
-def getMyVersionCode() {
-    def parsedManifestXml = (new XmlSlurper())
-            .parse("${projectDir}/src/main/AndroidManifest.xml")
-            .declareNamespace(android: "http://schemas.android.com/apk/res/android")
-    return parsedManifestXml."@android:versionCode".toInteger()
+import org.apache.tools.ant.filters.ReplaceTokens
+
+apply plugin: "com.android.application"
+apply plugin: 'com.getkeepsafe.dexcount'
+
+repositories {
+    maven { url "https://jitpack.io" }
+    mavenCentral()
 }
 
 android {
@@ -40,8 +29,11 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode getMyVersionCode()
-        versionName "${getMyVersionName()}"
+        // Version code schema:
+        // "1.2.3-SNAPSHOT" -> 1020300
+        // "1.2.3-RC4"      -> 1020304
+        versionCode 1070196
+        versionName "1.7.1"
         testApplicationId "de.test.antennapod"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         generatedDensities = []
@@ -95,7 +87,7 @@ android {
         release {
             resValue "string", "provider_authority", "de.danoeh.antennapod.provider"
             minifyEnabled true
-            proguardFile "proguard.cfg"
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), "proguard.cfg"
             signingConfig signingConfigs.releaseConfig
             buildConfigField STRING, FLATTR_APP_KEY, mFlattrAppKey
             buildConfigField STRING, FLATTR_APP_SECRET, mFlattrAppSecret
@@ -186,6 +178,7 @@ dependencies {
 
     implementation 'com.github.mfietz:fyydlin:v0.4.1'
     implementation 'com.github.ByteHamster:SearchPreference:v1.0.8'
+    implementation "org.awaitility:awaitility:$awaitilityVersion"
 
     androidTestImplementation "com.jayway.android.robotium:robotium-solo:$robotiumSoloVersion"
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
@@ -196,8 +189,16 @@ dependencies {
 }
 
 play {
-    serviceAccountEmail = '522080222319-compute@developer.gserviceaccount.com'
-    pk12File = file('../serviceaccount-c3d7d0f61387.p12')
+    if (project.hasProperty("antennaPodServiceAccountEmail")) {
+        serviceAccountEmail = antennaPodServiceAccountEmail
+    } else {
+        serviceAccountEmail = '522080222319-compute@developer.gserviceaccount.com'
+    }
+    if (project.hasProperty("antennaPodPk12File")) {
+        serviceAccountCredentials = file(antennaPodPk12File)
+    } else {
+        serviceAccountCredentials = file('../serviceaccount-c3d7d0f61387.p12')
+    }
 }
 
 // about.html is templatized so that we can automatically insert