Updated build script to handle BinTray creds better

a0224 · Feb 20, 2017 · 23fa274 · 23fa274
1 parent 5f2e3e6
commit 23fa274
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/alerter/build.gradle b/alerter/build.gradle
@@ -36,8 +36,8 @@ android {
 
 //BinTray configuration - credentials stored in user's gradle.properties
 bintray {
-    user = project.hasProperty('BINTRAY_USER')? project.getProperty('BINTRAY_USER') : null
-    key  = project.hasProperty('BINTRAY_KEY')? project.getProperty('BINTRAY_KEY') : null
+    user = getBinTrayUser()
+    key  = getBinTrayKey()
 
     publications = ['Alerter']
 
@@ -133,7 +133,7 @@ bintrayUpload.dependsOn 'generatePomFileForAlerterPublication'
 
 task showBintrayProps {
     doLast {
-        println "Bintray user/password: ${project.hasProperty('BINTRAY_USER')? project.getProperty('BINTRAY_USER') : null}/${project.hasProperty('BINTRAY_KEY')? project.getProperty('BINTRAY_KEY') : null}"
+        println "Bintray user/password: ${getBinTrayUser()}/${getBinTrayKey()}"
     }
 }
 
@@ -158,3 +158,13 @@ artifacts {
     archives javadocJar
     archives sourcesJar
 }
+
+def final getBinTrayUser() {
+    def final String BINTRAY_USER = "BINTRAY_USER"
+    return project.hasProperty(BINTRAY_USER)? project.getProperty(BINTRAY_USER) : null
+}
+
+def final getBinTrayKey() {
+    def final String BINTRAY_KEY  = "BINTRAY_KEY"
+    return project.hasProperty(BINTRAY_KEY)? project.getProperty(BINTRAY_KEY) : null
+}