From 03db84e7b23a901d25304435b0af87e5a225421c Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 7 Oct 2018 13:48:28 +0100
Subject: [PATCH v1] travis: build against jdk 10 and 11, requiring a bump in
 ant versions

the ant supplied by travis on trusty doesn't recognize java >8. fetching
it manually is ugly but does allow us to unify ant installation across OSs
---
 .travis.yml | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c50c2213e..288fbee9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,15 @@
 language: java
-script: (eval "$ANT_INVOCATION $(test $TRAVIS_JDK_VERSION = openjdk8 && echo -DnoJavaFX=true) test-unit-hardfail")
+script:
+  - ant -version
+  - (eval "$ANT_INVOCATION $(test ${TRAVIS_JDK_VERSION:0:4} = open && echo -DnoJavaFX=true) test-unit-hardfail")
 os: linux
 dist: trusty
 env:
   - ANT_INVOCATION="xvfb-run ant -Dtest.headless=false"
   - ANT_INVOCATION="ant -Dtest.headless=true"
 jdk:
-  - oraclejdk9
-  - oraclejdk8
+  - oraclejdk11
+  - oraclejdk10
   - openjdk8
 matrix:
   include:
@@ -16,12 +18,6 @@ matrix:
     jdk: ~
     env: ANT_INVOCATION="ant -Dtest.headless=true"
 before_install:
-  - >
-    case "${TRAVIS_OS_NAME:-linux}" in
-    linux)
-      ;;
-    osx)
-      brew update
-      brew install ant
-      ;;
-    esac;
+  - wget https://www.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.tar.gz
+  - tar -xzvf apache-ant-1.10.5-bin.tar.gz
+  - export PATH=`pwd`/apache-ant-1.10.5/bin:$PATH
-- 
2.11.0