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 /scalaworker | |
| 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 'scalaworker')
| -rw-r--r-- | scalaworker/src/mill/scalaworker/ScalaWorker.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scalaworker/src/mill/scalaworker/ScalaWorker.scala b/scalaworker/src/mill/scalaworker/ScalaWorker.scala index ddf6f916..ca20ccf1 100644 --- a/scalaworker/src/mill/scalaworker/ScalaWorker.scala +++ b/scalaworker/src/mill/scalaworker/ScalaWorker.scala @@ -89,7 +89,7 @@ class ScalaWorker(ctx0: mill.util.Ctx, .get val sourceFolder = mill.modules.Util.unpackZip(sourceJar)(workingDir) - val classloader = new URLClassLoader(compilerJars.map(_.toURI.toURL), null) + val classloader = mill.util.ClassLoader.create(compilerJars.map(_.toURI.toURL), null) val scalacMain = classloader.loadClass("scala.tools.nsc.Main") val argsArray = Array[String]( "-d", compiledDest.toString, @@ -145,7 +145,7 @@ class ScalaWorker(ctx0: mill.util.Ctx, val compilerClassLoader = scalaClassloaderCache match{ case Some((k, v)) if k == compilerClassloaderSig => v case _ => - val classloader = new URLClassLoader(compilerJars.map(_.toURI.toURL), null) + val classloader = mill.util.ClassLoader.create(compilerJars.map(_.toURI.toURL), null) scalaClassloaderCache = Some((compilerClassloaderSig, classloader)) classloader } @@ -155,7 +155,7 @@ class ScalaWorker(ctx0: mill.util.Ctx, case _ => val scalaInstance = new ScalaInstance( version = scalaVersion, - loader = new URLClassLoader(pluginJars.map(_.toURI.toURL), compilerClassLoader), + loader = mill.util.ClassLoader.create(pluginJars.map(_.toURI.toURL), compilerClassLoader), libraryJar = grepJar(compilerClasspath, s"scala-library-$scalaVersion.jar"), compilerJar = grepJar(compilerClasspath, s"scala-compiler-$scalaVersion.jar"), allJars = compilerJars ++ pluginJars, |