Changes to make {clientserver,main,scalalib,scalajslib}.test work under Java 9 (#217)

* Append "exported rt.jar" when creating URLClassLoader.

* Disabled tests involving Scala 2.10 & 2.11 and nashorn.

* Use java.net.URLClassLoader.

2 files changed, 7 insertions, 2 deletions

diff --git a/main/src/mill/modules/Jvm.scala b/main/src/mill/modules/Jvm.scala
index 153e1959..dba3552d 100644
--- a/main/src/mill/modules/Jvm.scala
+++ b/main/src/mill/modules/Jvm.scala
@@ -104,7 +104,7 @@ object Jvm {
                    body: ClassLoader => T): T = {
     val cl = if (classLoaderOverrideSbtTesting) {
       val outerClassLoader = getClass.getClassLoader
-      new URLClassLoader(classPath.map(_.toIO.toURI.toURL).toArray, null){
+      new URLClassLoader(classPath.map(_.toIO.toURI.toURL).toArray, mill.util.ClassLoader.create(Seq(), null)){
         override def findClass(name: String) = {
           if (name.startsWith("sbt.testing.")){
             outerClassLoader.loadClass(name)
@@ -114,7 +114,7 @@ object Jvm {
         }
       }
     } else {
-      new URLClassLoader(classPath.map(_.toIO.toURI.toURL).toArray, null)
+      mill.util.ClassLoader.create(classPath.map(_.toIO.toURI.toURL).toVector, null)
     }
     val oldCl = Thread.currentThread().getContextClassLoader
     Thread.currentThread().setContextClassLoader(cl)
diff --git a/main/test/src/mill/util/TestUtil.scala b/main/test/src/mill/util/TestUtil.scala
index d06c7f6a..d0caade7 100644
--- a/main/test/src/mill/util/TestUtil.scala
+++ b/main/test/src/mill/util/TestUtil.scala
@@ -78,4 +78,9 @@ object TestUtil {
       }
     }
   }
+  def disableInJava9OrAbove(f: => Any): Unit = {
+    if (!ammonite.util.Util.java9OrAbove) {
+      f
+    }
+  }
 }