summaryrefslogtreecommitdiff
path: root/app/build.gradle
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-04-14 17:47:47 +0200
committerParménides GV <parmegv@sdf.org>2014-04-14 17:47:47 +0200
commitc008ab0e0e7f25afe47a6fca906426820b5dad64 (patch)
tree70fed72a8f537106940a38285979fca83fed832d /app/build.gradle
parentb2f8436c729a92690e51716bc518173656214e29 (diff)
parenta6675ae98c90649f81c50288a00614a0100fb335 (diff)
Merge branch 'bug/adjust-build-tools-version-#5491' into develop
Diffstat (limited to 'app/build.gradle')
-rw-r--r--app/build.gradle27
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
}