Merge branch 'release/0.4.3'

stefanhoth · Apr 1, 2014 · ac3ba53 · ac3ba53
2 parents f626903 + 2b9a602
commit ac3ba53
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,12 @@ jdk: oraclejdk7
 env:
   matrix:
     - ANDROID_TARGET=android-19  ANDROID_ABI=armeabi-v7a
+
+cache: apt
+branches:
+  only:
+    - master
+
 before_install:
   # Install base Android SDK
   - sudo apt-get update -qq

diff --git a/app/build.gradle b/app/build.gradle
@@ -29,8 +29,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 19
-        versionCode 6
-        versionName "0.4.2"
+        versionCode 7
+        versionName "0.4.3"
     }
 
     compileOptions {
@@ -73,29 +73,28 @@ dependencies {
 if (secretProps.containsKey("DEPLOYGATE_USERNAME") && secretProps.containsKey("DEPLOYGATE_TOKEN")) {
 
     apply plugin: 'deploygate'
-    gradle.taskGraph.whenReady { graph ->
 
-        project.configure(deploygate, {
-            userName = secretProps.getProperty("DEPLOYGATE_USERNAME")
-            token = secretProps.getProperty("DEPLOYGATE_TOKEN")
+    project.configure(deploygate, {
+        userName = secretProps.getProperty("DEPLOYGATE_USERNAME")
+        token = secretProps.getProperty("DEPLOYGATE_TOKEN")
 
-            apks {
-                beta {
-                    sourceFile = file("build/apk/app-beta-unaligned.apk")
+        apks {
+            beta {
+                sourceFile = file("build/apk/app-beta-unaligned.apk")
 
-                    def betaComment = secretProps.getProperty("DEPLOYGATE_RELEASE_NOTES")
-                    if (betaComment != null && betaComment.length() > 0) {
-                        releaseNote = betaComment
-                        message = betaComment
-                    }
+                def betaComment = secretProps.getProperty("DEPLOYGATE_RELEASE_NOTES")
+                if (betaComment != null && betaComment.length() > 0) {
+                    releaseNote = betaComment
+                    message = betaComment
+                }
 
-                    if (secretProps.hasProperty("DEPLOYGATE_DISTRIBUTION_ID")) {
-                        distributionKey = secretProps.getProperty("DEPLOYGATE_DISTRIBUTION_ID")
-                    }
+                if (secretProps.hasProperty("DEPLOYGATE_DISTRIBUTION_ID")) {
+                    distributionKey = secretProps.getProperty("DEPLOYGATE_DISTRIBUTION_ID")
                 }
             }
-        })
-    }
+        }
+    })
+
 }
 
 def getReleaseNotes(flavor) {