Fixed Travis deployment of snapshots by falling back to sysenv correctly

Author: Marcel Schnelle

android-junit5/build.gradle

@@ -167,7 +167,7 @@ project.configure(project) {
                 repo = "maven"
                 name = ARTIFACT_ID
                 userOrg = project.ext.bintrayUser
-                licenses = ["EPL-1.0"]
+                licenses = [LICENCE_NAME]
                 publish = true
                 publicDownloadNumbers = true
                 vcsUrl = VCS_URL

build.gradle

@@ -8,30 +8,26 @@ buildscript {
     }
 }
 
-// Populate deployment credentials:
-// * Local development - stored in properties file
-// * CI Server - stored in environment variables
-def bintrayUser = ""
-def bintrayKey = ""
-def sonatypeUser = ""
-def sonatypePass = ""
+// Populate deployment credentials in an environment-aware fashion.
+//
+// * Local development:
+//      Stored in local.properties file on the machine
+// * CI Server:
+//      Stored in environment variables before launch
+Properties properties = new Properties()
 
 def credentialsFile = new File(project.rootDir, "local.properties")
 if (credentialsFile.exists()) {
-    Properties properties = new Properties()
     credentialsFile.withReader { properties.load(it) }
-    bintrayUser = properties.get("BINTRAY_USER")
-    bintrayKey = properties.get("BINTRAY_KEY")
-    sonatypeUser = properties.get("SONATYPE_USER")
-    sonatypePass = properties.get("SONATYPE_PASS")
-
-} else {
-    bintrayUser = System.getenv("bintrayUser")
-    bintrayKey = System.getenv("bintrayKey")
-    sonatypeUser = System.getenv("sonatypeUser")
-    sonatypePass = System.getenv("sonatypePass")
 }
 
+// @formatter:off
+def bintrayUser     = properties.get("BINTRAY_USER",    System.getenv("bintrayUser"))
+def bintrayKey      = properties.get("BINTRAY_KEY",     System.getenv("bintrayKey"))
+def sonatypeUser    = properties.get("SONATYPE_USER",   System.getenv("sonatypeUser"))
+def sonatypePass    = properties.get("SONATYPE_PASS",   System.getenv("sonatypePass"))
+// @formatter:on
+
 allprojects {
     repositories {
         google()

gradle.properties

@@ -4,6 +4,7 @@
 GROUP_ID                  = de.mannodermaus.gradle.plugins
 ARTIFACT_ID               = android-junit5
 VERSION_NAME              = 1.0.0-M5-SNAPSHOT
+LICENCE_NAME              = EPL-1.0
 DESCRIPTION               = Unit Testing with JUnit 5 for Android.
 VCS_URL                   = https://github.com/aurae/android-junit5
 

scripts/deploy_snapshot.sh

@@ -21,6 +21,6 @@ elif [ "$TRAVIS_BRANCH" != "$BRANCH" ]; then
   echo "Skipping snapshot deployment: wrong branch. Expected '$BRANCH' but was '$TRAVIS_BRANCH'."
 else
   echo "Deploying snapshot..."
-  ./gradlew publishLibraryPublicationToSnapshotRepository
+  ./gradlew publishLibraryPublicationToSnapshotRepository --info --stacktrace
   echo "Snapshot deployed!"
 fi