Bump version, try to fix travis (#33)

natario1 · Jun 14, 2018 · 8e9d8ca · 8e9d8ca
1 parent 5516fbb
commit 8e9d8ca
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Flexible utilities to control and animate zoom and translation of Views and much
 programmatically or through touch events.
 
 ```groovy
-compile 'com.otaliastudios:zoomlayout:1.2.0'
+compile 'com.otaliastudios:zoomlayout:1.3.0'
 ```
 
 <p>

diff --git a/library/build.gradle b/library/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'com.jfrog.bintray'
 // Required by bintray
 // archivesBaseName is required if artifactId is different from gradle module name
 // or you can add baseName to each archive task (sources, javadoc, aar)
-version = '1.2.0'
+version = '1.3.0'
 group = 'com.otaliastudios'
 archivesBaseName = 'zoomlayout'
 
@@ -68,36 +68,47 @@ install {
     }
 }
 
-def bintrayUser = System.getenv("BINTRAY_USER")
-def bintrayKey = System.getenv("BINTRAY_KEY")
-if (bintrayKey == null) {
+def bintrayUser
+def bintrayKey
+def hasBintray = false
+if (System.getenv('TRAVIS') == 'true') {
+    if (System.getenv('TRAVIS_SECURE_ENV_VARS') == 'true') {
+        bintrayUser = System.getenv("BINTRAY_USER")
+        bintrayKey = System.getenv("BINTRAY_KEY")
+        hasBintray = true
+    }
+} else {
     Properties props = new Properties()
     props.load(project.rootProject.file('local.properties').newDataInputStream())
     bintrayUser = props.getProperty('bintray.user')
     bintrayKey = props.get('bintray.key')
+    hasBintray = true
 }
 
-bintray {
-    // https://github.com/bintray/gradle-bintray-plugin
-    user = bintrayUser
-    key = bintrayKey
-    configurations = ['archives']
-    pkg {
-        repo = 'android'
-        name = 'ZoomLayout'
-        licenses = ['Apache-2.0']
-        vcsUrl = 'https://github.com/natario1/ZoomLayout.git'
-        publish = true
-        override = true
-        version {
-            name = project.version
-            desc = 'ZoomLayout v. '+project.version
-            released = new Date()
-            vcsTag = 'v'+project.version
+if (hasBintray) {
+    bintray {
+        // https://github.com/bintray/gradle-bintray-plugin
+        user = bintrayUser
+        key = bintrayKey
+        configurations = ['archives']
+        pkg {
+            repo = 'android'
+            name = 'ZoomLayout'
+            licenses = ['Apache-2.0']
+            vcsUrl = 'https://github.com/natario1/ZoomLayout.git'
+            publish = true
+            override = true
+            version {
+                name = project.version
+                desc = 'ZoomLayout v. '+project.version
+                released = new Date()
+                vcsTag = 'v'+project.version
+            }
         }
     }
 }
 
+
 // From official sample https://github.com/bintray/bintray-examples/blob/master/gradle-aar-example/build.gradle
 task sourcesJar(type: Jar) {
     classifier = 'sources'