diff options
author | Robby <robby@santoslab.org> | 2018-03-10 19:32:42 -0600 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-03-10 17:32:42 -0800 |
commit | 46c516893a641a283f11a46f5c45a5cf1b4af373 (patch) | |
tree | b33f67713da653eba49b91fb8b67b839cec70726 /main/src | |
parent | 0c91649e548f4fe6620e067dfe7425e3bca0de62 (diff) | |
download | mill-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 'main/src')
-rw-r--r-- | main/src/mill/modules/Jvm.scala | 4 |
1 files changed, 2 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) |