Merge branch 'bug/adjust-build-tools-version-#5491' into develop

1 files changed, 8 insertions, 19 deletions

diff --git a/app/build.gradle b/app/build.gradle
index d9ff1fdf..94823b02 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'android'
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.0.1"
+    buildToolsVersion "19.0.3"
 
     defaultConfig {
         minSdkVersion 14
@@ -13,32 +13,21 @@ android {
     }
 
     signingConfigs {
-        release
+        release {
+		storeFile project.hasProperty('storeFileProperty') ? file(storeFileProperty) : null
+		storePassword project.hasProperty('storePasswordProperty') ?  storePasswordProperty : ""
+		keyAlias project.hasProperty('keyAliasProperty') ?  keyAliasProperty : ""
+		keyPassword project.hasProperty('keyPasswordProperty') ?  keyPasswordProperty : ""
+	}
     }
 
     buildTypes {
         release {
             runProguard true
-            signingConfig signingConfigs.release
+	    signingConfig signingConfigs.release.isSigningReady() ? signingConfigs.release : signingConfigs.debug
         }
     }
 
-    if (project.hasProperty('storeFile')) {
-      signingConfigs.release.storeFile = new File(storeFile)
-    }
-
-    if (project.hasProperty('storePassword')) {
-      signingConfigs.release.storePassword = storePassword
-    }
-
-    if (project.hasProperty('keyAlias')) {
-      signingConfigs.release.keyAlias = keyAlias
-    }
-
-    if (project.hasProperty('keyPassword')) {
-      signingConfigs.release.keyPassword = keyPassword
-    }
-
     lintOptions {
       abortOnError false
     }