From 192ab43112fb8cac90db83926cefd01fe5f86ec1 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Sat, 1 Nov 2014 21:44:49 -0500
Subject: [PATCH 1/3] Support JDK 8

 - no proguard if using jdk8
 - add jdk8 to travis
---
 .travis.yml                    |  1 +
 build.gradle                   | 14 ++++++++------
 scripts/travis-ci/run-tests.sh |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4969db70..cbe7da29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ language: java
 jdk:
   - openjdk7
   - oraclejdk7
+  - oraclejdk8
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq libstdc++6:i386 lib32z1 expect
diff --git a/build.gradle b/build.gradle
index c3e2b0a6..f1afb6be 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,15 +13,17 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-apply plugin: 'java'
 apply plugin: 'maven'
 apply from: 'gradle/functions.gradle'
 
 def apktoolversion_major = '2.0.0'
 def apktoolversion_minor = 'RC2';
 
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+allprojects {
+    apply plugin: 'java'
+    sourceCompatibility = 1.7
+    targetCompatibility = 1.7
+}
 
 if (!('release' in gradle.startParameter.taskNames)) {
     def hash = getCheckedOutGitCommitHash();
@@ -44,11 +46,11 @@ if (!('release' in gradle.startParameter.taskNames)) {
 build.doFirst {
     def javaVersion = System.getProperty("java.version")
 
-    //fail the build if we don't have the expected Java version
-    if (!javaVersion.startsWith("1.7")) {
+    //fail the build if we java 1.5 or 1.6.
+    if (javaVersion.startsWith("1.5") || javaVersion.startsWith("1.6")) {
         throw new GradleException("You can fix this problem!\n" +
                 "We found a " + javaVersion + " JDK\n" +
-                "Please update JAVA_HOME to use a 1.7 JDK\n" +
+                "Please update JAVA_HOME to use at least a 1.7 JDK\n" +
                 "Currently it is set to: " + System.getProperty("java.home")
         );
     }
diff --git a/scripts/travis-ci/run-tests.sh b/scripts/travis-ci/run-tests.sh
index c22ef629..347df4f6 100755
--- a/scripts/travis-ci/run-tests.sh
+++ b/scripts/travis-ci/run-tests.sh
@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-./gradlew build fatJar proguard
+./gradlew build fatJar

From a6340ea72bfc9089badb57f2f176f313b5d2f77d Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Sun, 2 Nov 2014 07:35:25 -0600
Subject: [PATCH 2/3] add osx w/ allowed failures on jdk8

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index cbe7da29..38b82ff4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,9 @@ jdk:
   - openjdk7
   - oraclejdk7
   - oraclejdk8
+os:
+  - linux
+  - osx
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq libstdc++6:i386 lib32z1 expect
@@ -13,3 +16,6 @@ branches:
   only:
     - master
     - stable
+matrix:
+  allow_failures:
+    - jdk: oraclejdk8

From 9265a9877af5c880364236801ae79ebe6674fe0e Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Sun, 2 Nov 2014 07:40:02 -0600
Subject: [PATCH 3/3] add notifications for irc

---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 38b82ff4..fe63d55a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,3 +19,11 @@ branches:
 matrix:
   allow_failures:
     - jdk: oraclejdk8
+notifications:
+  irc:
+    channels:
+      - "chat.freenode.net#apktool"
+    on_success: change
+    on_failure: always
+    template:
+      - "%{repository_name} (%{commit}) : %{duration} - %{message}"