diff options
| author | Robby <robby@santoslab.org> | 2018-03-13 11:41:43 -0500 |
|---|---|---|
| committer | Nikolay Tatarinov <5min4eq.unity@gmail.com> | 2018-03-13 19:41:43 +0300 |
| commit | a9d4eea6f5b81cdbef84724e612bf07954e2673c (patch) | |
| tree | 8d9219a5c9f8e5153e71c21e797a4cb1ff32e733 /scalalib/src | |
| parent | ac7eedc2cc858a778a63a7e03ccd03bac2676871 (diff) | |
| download | mill-a9d4eea6f5b81cdbef84724e612bf07954e2673c.tar.gz mill-a9d4eea6f5b81cdbef84724e612bf07954e2673c.tar.bz2 mill-a9d4eea6f5b81cdbef84724e612bf07954e2673c.zip | |
Fixes for non-interactive (client/server) mode on Java 9 (#221)
* Fixes for client/server mode on Java 9.
* Upgraded ammonite to 1.0.5-4-c0cdbaf.
Diffstat (limited to 'scalalib/src')
| -rw-r--r-- | scalalib/src/mill/scalalib/ScalaModule.scala | 2 | ||||
| -rw-r--r-- | scalalib/src/mill/scalalib/ScalaWorkerApi.scala | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index 119d4d47..c06fb8f3 100644 --- a/scalalib/src/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala @@ -316,7 +316,7 @@ trait ScalaModule extends mill.Module with TaskModule { outer => } def ammoniteReplClasspath = T{ - resolveDeps(T.task{Agg(ivy"com.lihaoyi:::ammonite:1.0.3")})() + resolveDeps(T.task{Agg(ivy"com.lihaoyi:::ammonite:1.0.5-4-c0cdbaf")})() } def repl() = T.command{ if (T.ctx().log.inStream == DummyInputStream){ diff --git a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala index 2d04ac4e..91222524 100644 --- a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala +++ b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala @@ -31,8 +31,8 @@ trait ScalaWorkerModule extends mill.Module{ } } def worker: Worker[ScalaWorkerApi] = T.worker{ - val cl = new java.net.URLClassLoader( - classpath().map(_.toNIO.toUri.toURL).toArray, + val cl = mill.util.ClassLoader.create( + classpath().map(_.toNIO.toUri.toURL).toVector, getClass.getClassLoader ) val cls = cl.loadClass("mill.scalaworker.ScalaWorker") |