From 685f0353f2301ce3cc10acd4faf2da27bc472222 Mon Sep 17 00:00:00 2001
From: "R. Tyler Croy" <tyler@monkeypox.org>
Date: Sat, 4 Jul 2015 13:40:25 -0700
Subject: [PATCH 1/4] Add support for automatically publishing to Bintray when
 a build succeeds

---
 .travis.yml       |  6 ++++++
 build.gradle      | 16 ++++++++++++----
 gradle.properties |  2 ++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 51b9d9c..9ffd83b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,3 +2,9 @@ language: java
 jdk:
 - oraclejdk7
 - oraclejdk8
+env:
+  global:
+    secure: MzcJafov6+fztyym0hZFTxjirTAgVFqFRO4pSSoDUZV71jHBYRKLmQxiaYpqdl9d7Q7Jz7UfNZRSisNwZQdeZjs0B9yJwy9m1mDlJaUXIWN/xzW04qPnZ5zxh1yJHK+UHIw5G2qRZSE42m9G3TSRBlUz6OMk+tr2UYErfnKzcsc=
+
+after_success:
+    "./gradlew bintrayUpload -PbintrayUser=lookouteng -PbintrayKey=${BINTRAY_KEY}"
diff --git a/build.gradle b/build.gradle
index b84dea5..46a9aec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,11 +7,19 @@ apply plugin: 'application'
 
 group = "com.github.lookout"
 description = "A utility for monitoring the delay of Kafka consumers"
-version = '0.2.0'
+version = '0.2'
 mainClassName = 'com.github.lookout.verspaetung.Main'
 defaultTasks 'clean', 'check'
-sourceCompatibility = '1.7'
-targetCompatibility = '1.7'
+
+
+/* Little bit of version shenanigans to get a MINOR number supplied by Travis */
+
+if (System.env.TRAVIS_BUILD_NUMBER) {
+    version = "${version}.${System.env.TRAVIS_BUILD_NUMBER}"
+}
+else {
+    version = "${version}.0-SNAPSHOT"
+}
 
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -39,7 +47,7 @@ repositories {
 }
 
 dependencies {
-    compile 'org.codehaus.groovy:groovy-all:2.4.0+'
+    compile 'org.codehaus.groovy:groovy-all:2.4.3+'
 
     [
      'curator-framework',
diff --git a/gradle.properties b/gradle.properties
index 760775d..ee1405f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,5 @@
 org.gradle.daemon=true
 bintrayUser=
 bintrayKey=
+sourceCompatibility=1.7
+targetCompatibility=1.7

From 5cc83eef08f7b30123981144501d6b8102a8dd4e Mon Sep 17 00:00:00 2001
From: "R. Tyler Croy" <tyler@monkeypox.org>
Date: Sat, 4 Jul 2015 13:50:39 -0700
Subject: [PATCH 2/4] Dry run for now to avoid publishing builds

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 46a9aec..91f7422 100644
--- a/build.gradle
+++ b/build.gradle
@@ -102,7 +102,7 @@ bintray {
     user = project.bintrayUser
     key = project.bintrayKey
     publish = true
-    dryRun = false
+    dryRun = true
     configurations = ['archives']
 
     pkg {

From 1c588f6bff0ec85a6cf3e60a27de2d379909730c Mon Sep 17 00:00:00 2001
From: "R. Tyler Croy" <tyler@monkeypox.org>
Date: Sat, 4 Jul 2015 14:02:58 -0700
Subject: [PATCH 3/4] Change the automatic deployment to only operate when a
 user has published a tag that successfully builds

---
 .travis.yml  |  1 +
 build.gradle | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9ffd83b..8ae8fd9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: java
+# Only the oraclejdk7 build on a tag will actually release
 jdk:
 - oraclejdk7
 - oraclejdk8
diff --git a/build.gradle b/build.gradle
index 91f7422..84506a4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,19 +7,9 @@ apply plugin: 'application'
 
 group = "com.github.lookout"
 description = "A utility for monitoring the delay of Kafka consumers"
-version = '0.2'
+version = '0.2.1'
 mainClassName = 'com.github.lookout.verspaetung.Main'
-defaultTasks 'clean', 'check'
-
-
-/* Little bit of version shenanigans to get a MINOR number supplied by Travis */
-
-if (System.env.TRAVIS_BUILD_NUMBER) {
-    version = "${version}.${System.env.TRAVIS_BUILD_NUMBER}"
-}
-else {
-    version = "${version}.0-SNAPSHOT"
-}
+defaultTasks 'clean', 'check', 'assemble'
 
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -102,7 +92,12 @@ bintray {
     user = project.bintrayUser
     key = project.bintrayKey
     publish = true
-    dryRun = true
+    /*
+     * Only only publish when we're tagging a release and if we've executed on
+     * the JDK7 build. This is to prevent multiple attempts by the build matrix
+     * to publish the artifacts
+     */
+    dryRun = !((System.env.TRAVIS_TAG as boolean) && (System.env.TRAVIS_JDK_VERSION == 'oraclejdk7'))
     configurations = ['archives']
 
     pkg {

From 27d51c84e4c04427059fa252bc4e5c72cdd0c604 Mon Sep 17 00:00:00 2001
From: "R. Tyler Croy" <tyler@monkeypox.org>
Date: Sat, 4 Jul 2015 14:06:24 -0700
Subject: [PATCH 4/4] Use Gradle 2.4 for future builds

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 479ffbe..b4d0934 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip