Test mill using Java 9 (in addition to Java 8) (#219)

* Test mill using Java 9 (in addition to Java 8).

* Use mill -i.

* Fixed Java 9 path.

8 files changed, 44 insertions, 16 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index 8fa75778..376d0ece 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -15,14 +15,22 @@ environment:
     MSYS2_DIR: msys64
     MSYSTEM: MINGW64
     BIT: 64
-    JAVA_HOME: 'C:\Program Files\Java\jdk1.8.0'
-  PATH: '%JAVA_HOME%\bin;C:\bin;C:\%MSYS2_DIR%\%MSYSTEM%\bin;C:\%MSYS2_DIR%\usr\bin;%PATH%'
+    JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+  - COMPILER: msys2
+    PLATFORM: x64
+    MSYS2_ARCH: x86_64
+    MSYS2_DIR: msys64
+    MSYSTEM: MINGW64
+    BIT: 64
+    JAVA_HOME: C:\Program Files\Java\jdk9
 
 cache:
   - '%LOCALAPPDATA%\Coursier\cache'
 
 install:
-  - bash -lc "mkdir /c/bin && curl -Lo /c/bin/mill https://github.com/lihaoyi/mill/releases/download/0.1.4/0.1.4-12-f5250d"
+  - cmd: SET PATH=%JAVA_HOME%\bin;C:\bin;C:\%MSYS2_DIR%\%MSYSTEM%\bin;C:\%MSYS2_DIR%\usr\bin;%PATH%
+  - cmd: java -version
+  - bash -lc "mkdir /c/bin && curl -Lo /c/bin/mill https://github.com/lihaoyi/mill/releases/download/0.1.4/0.1.4-22-95e6cb"
 
 build_script:
   - bash -lc "cd /c/mill && mill -i all main.test scalajslib.test"
diff --git a/.travis.yml b/.travis.yml
index 45373358..a7c66a8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,28 +2,41 @@ language: scala
 sudo: required
 dist: trusty
 
-jdk:
-  - oraclejdk8
-
 matrix:
   include:
   - stage: build
     env: CI_SCRIPT=ci/test-mill-0.sh
+    jdk: oraclejdk9
+  - stage: build
+    env: CI_SCRIPT=ci/test-mill-0.sh
+    jdk: oraclejdk8
   - stage: build
     env: CI_SCRIPT=ci/test-mill-1.sh
+    jdk: oraclejdk8
   - stage: build
     env: CI_SCRIPT=ci/test-mill-2.sh
+    jdk: oraclejdk8
   - stage: build
     env: CI_SCRIPT=ci/test-mill-dev.sh
+    jdk: oraclejdk9
+  - stage: build
+    env: CI_SCRIPT=ci/test-mill-dev.sh
+    jdk: oraclejdk8
+  - stage: build
+    env: CI_SCRIPT=ci/test-mill-release.sh
+    jdk: oraclejdk9
   - stage: build
     env: CI_SCRIPT=ci/test-mill-release.sh
+    jdk: oraclejdk8
   - stage: release
     env: CI_SCRIPT="ci/on-master.py ci/release.sh"
+    jdk: oraclejdk8
   - stage: release
     env: CI_SCRIPT="ci/on-master.py ci/publish-docs.sh"
+    jdk: oraclejdk8
 
 script:
-  - curl -L -o ~/bin/mill https://github.com/lihaoyi/mill/releases/download/0.1.3/0.1.3 && chmod +x ~/bin/mill
+  - curl -L -o ~/bin/mill https://github.com/lihaoyi/mill/releases/download/0.1.4/0.1.4-22-95e6cb && chmod +x ~/bin/mill
   - export PATH=~/bin/mill:$PATH
   - "$CI_SCRIPT"
 
diff --git a/ci/publish-local.sh b/ci/publish-local.sh
index fc9e06b9..c137340d 100755
--- a/ci/publish-local.sh
+++ b/ci/publish-local.sh
@@ -2,6 +2,6 @@
 
 set -eux
 
-mill all __.publishLocal release
+mill -i all __.publishLocal release
 
 mv out/release/dest/mill ~/mill-release
diff --git a/ci/test-mill-0.sh b/ci/test-mill-0.sh
index 3d1470f1..ee5b7213 100755
--- a/ci/test-mill-0.sh
+++ b/ci/test-mill-0.sh
@@ -6,4 +6,4 @@ set -eux
 git clean -xdf
 
 # Run tests using Mill built using SBT
-mill all {clientserver,main,scalalib,scalajslib}.test
+mill -i all {clientserver,main,scalalib,scalajslib}.test
diff --git a/ci/test-mill-dev.sh b/ci/test-mill-dev.sh
index cb83ef00..11d64154 100755
--- a/ci/test-mill-dev.sh
+++ b/ci/test-mill-dev.sh
@@ -6,7 +6,7 @@ set -eux
 git clean -xdf
 
 # Build Mill using SBT
-mill dev.assembly
+mill -i dev.assembly
 
 # Second build & run tests using Mill
 out/dev/assembly/dest/mill -i all {clientserver,main,scalalib,scalajslib}.test
diff --git a/ci/test-mill-release.sh b/ci/test-mill-release.sh
index 3c70410b..8c0aca2f 100755
--- a/ci/test-mill-release.sh
+++ b/ci/test-mill-release.sh
@@ -11,4 +11,4 @@ git clean -xdf
 
 # Second build & run tests using Mill
 
-~/mill-release integration.test "mill.integration.forked.{AcyclicTests,UpickleTests}"
+~/mill-release -i integration.test "mill.integration.forked.{AcyclicTests,UpickleTests}"
diff --git a/integration/test/src/mill/integration/AcyclicTests.scala b/integration/test/src/mill/integration/AcyclicTests.scala
index d1035af0..c117f862 100644
--- a/integration/test/src/mill/integration/AcyclicTests.scala
+++ b/integration/test/src/mill/integration/AcyclicTests.scala
@@ -25,7 +25,7 @@ class AcyclicTests(fork: Boolean)
       assert(!brokenCompile)
     }
 
-    'scala2118 - check("2.11.8")
+    'scala2118 - mill.util.TestUtil.disableInJava9OrAbove(check("2.11.8"))
     'scala2124 - check("2.12.4")
 
   }
diff --git a/integration/test/src/mill/integration/UpickleTests.scala b/integration/test/src/mill/integration/UpickleTests.scala
index dba6488d..1b83c60f 100644
--- a/integration/test/src/mill/integration/UpickleTests.scala
+++ b/integration/test/src/mill/integration/UpickleTests.scala
@@ -6,12 +6,19 @@ import utest._
 class UpickleTests(fork: Boolean) extends IntegrationTestSuite("MILL_UPICKLE_REPO", "upickle", fork) {
   val tests = Tests{
     initWorkspace()
-    'jvm - {
-      assert(eval("upickleJvm[2.11.11].test"))
-      val jvmMeta = meta("upickleJvm[2.11.11].test.test")
+    'jvm21111 - {
+      mill.util.TestUtil.disableInJava9OrAbove({
+        assert(eval("upickleJvm[2.11.11].test"))
+        val jvmMeta = meta("upickleJvm[2.11.11].test.test")
+        assert(jvmMeta.contains("example.ExampleTests.simple"))
+        assert(jvmMeta.contains("upickle.MacroTests.commonCustomStructures.simpleAdt"))
+      })
+    }
+    'jvm2124 - {
+      assert(eval("upickleJvm[2.12.4].test"))
+      val jvmMeta = meta("upickleJvm[2.12.4].test.test")
       assert(jvmMeta.contains("example.ExampleTests.simple"))
       assert(jvmMeta.contains("upickle.MacroTests.commonCustomStructures.simpleAdt"))
-
     }
     'js - {
       assert(eval("upickleJs[2.12.4].test"))