From 46c516893a641a283f11a46f5c45a5cf1b4af373 Mon Sep 17 00:00:00 2001
From: Robby <robby@santoslab.org>
Date: Sat, 10 Mar 2018 19:32:42 -0600
Subject: 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.
---
 scalajslib/src/mill/scalajslib/ScalaJSBridge.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scalajslib/src')

diff --git a/scalajslib/src/mill/scalajslib/ScalaJSBridge.scala b/scalajslib/src/mill/scalajslib/ScalaJSBridge.scala
index 17bcd6c7..322a6ca4 100644
--- a/scalajslib/src/mill/scalajslib/ScalaJSBridge.scala
+++ b/scalajslib/src/mill/scalajslib/ScalaJSBridge.scala
@@ -27,8 +27,8 @@ class ScalaJSWorker {
     scalaInstanceCache match {
       case Some((sig, bridge)) if sig == classloaderSig => bridge
       case _ =>
-        val cl = new URLClassLoader(
-          toolsClasspath.map(_.toIO.toURI.toURL).toArray,
+        val cl = mill.util.ClassLoader.create(
+          toolsClasspath.map(_.toIO.toURI.toURL).toVector,
           getClass.getClassLoader
         )
         val bridge = cl
-- 
cgit v1.2.3