Merge pull request #1574 from iBotPeaches/issue-1571

rework travis-ci builds

.travis.yml

@@ -1,24 +1,26 @@
 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
 cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
-before_install:
+install: ./gradlew build
-  - 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
 script: ./gradlew build shadowJar proguard
 branches:
   only: