From 5526e363c65cf7f2618134ff7883f69023f74b60 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <me@connortumbleson.com>
Date: Mon, 31 Jul 2017 06:32:46 -0400
Subject: [PATCH 1/2] rework travis-ci builds

---
 .travis.yml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 719a1fe1..fb1a43b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,27 @@
 env:
    - TERM=dumb
 language: java
-jdk:
-  - openjdk7
-  - oraclejdk7
-  - oraclejdk8
 matrix:
+  include:
+    - os: linux
+      jdk: openjdk7
+    - os: linux
+      dist: precise
+      jdk: oraclejdk7
+    - os: linux
+      jdk: oraclejdk8
+    - os: linux
+      dist: trusty
+      jdk: openjdk8
+    - os: osx
   allow_failures:
     - jdk: openjdk7
-os:
-  - linux
+    - jdk: openjdk8
 cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
-before_install:
-  - git config --global user.email "travis@connortumbleson.com"
-  - git config --global user.name "Travis CI Bot"
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq libstdc++6:i386 lib32z1 expect
+install: ./gradlew build
 script: ./gradlew build shadowJar proguard
 branches:
   only:

From 0ff93b6fc44853ba4dcc640a154c13b1a4af7076 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <me@connortumbleson.com>
Date: Mon, 31 Jul 2017 06:39:27 -0400
Subject: [PATCH 2/2] openjdk8 is not allowed to fail

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fb1a43b9..7a4864a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,6 @@ matrix:
     - os: osx
   allow_failures:
     - jdk: openjdk7
-    - jdk: openjdk8
 cache:
   directories:
     - $HOME/.gradle/caches/