summaryrefslogtreecommitdiff
path: root/scalajslib/src
diff options
context:
space:
mode:
authorRobby <robby@santoslab.org>2018-03-10 19:32:42 -0600
committerLi Haoyi <haoyi.sg@gmail.com>2018-03-10 17:32:42 -0800
commit46c516893a641a283f11a46f5c45a5cf1b4af373 (patch)
treeb33f67713da653eba49b91fb8b67b839cec70726 /scalajslib/src
parent0c91649e548f4fe6620e067dfe7425e3bca0de62 (diff)
downloadmill-46c516893a641a283f11a46f5c45a5cf1b4af373.tar.gz
mill-46c516893a641a283f11a46f5c45a5cf1b4af373.tar.bz2
mill-46c516893a641a283f11a46f5c45a5cf1b4af373.zip
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.
Diffstat (limited to 'scalajslib/src')
-rw-r--r--scalajslib/src/mill/scalajslib/ScalaJSBridge.scala4
1 files changed, 2 insertions, 2 deletions
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