From b913c6b5b37e5cbdd34c067df831ac05efb3ec79 Mon Sep 17 00:00:00 2001 From: Robby Date: Mon, 26 Mar 2018 10:39:35 -0500 Subject: Upgrade Ammonite to 1.1.0-3-73d5734. --- build.sc | 4 ++-- core/src/mill/util/ClassLoader.scala | 2 +- scalalib/src/mill/scalalib/ScalaModule.scala | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sc b/build.sc index 49fd6808..e2f9c027 100755 --- a/build.sc +++ b/build.sc @@ -65,7 +65,7 @@ trait MillModule extends MillPublishModule{ outer => object clientserver extends MillModule{ def ivyDeps = Agg( - ivy"com.lihaoyi:::ammonite:1.1.0", + ivy"com.lihaoyi:::ammonite:1.1.0-3-73d5734", ivy"org.scala-sbt.ipcsocket:ipcsocket:1.0.0" ) val test = new Tests(implicitly) @@ -80,7 +80,7 @@ object core extends MillModule { def ivyDeps = Agg( ivy"com.lihaoyi::sourcecode:0.1.4", - ivy"com.lihaoyi:::ammonite:1.1.0", + ivy"com.lihaoyi:::ammonite:1.1.0-3-73d5734", ) def generatedSources = T { diff --git a/core/src/mill/util/ClassLoader.scala b/core/src/mill/util/ClassLoader.scala index d650aceb..8017c958 100644 --- a/core/src/mill/util/ClassLoader.scala +++ b/core/src/mill/util/ClassLoader.scala @@ -52,7 +52,7 @@ object ClassLoader { private def makeUrls(urls: Seq[URL])(implicit ctx: Ctx.Home): Seq[URL] = { if (ammonite.util.Util.java9OrAbove) { - val rtFile = ctx.home / s"rt-${System.getProperty("java.version")}.jar" + val rtFile = ctx.home / ammonite.runtime.Classpath.rtJarName if (!exists(rtFile)) { cp(Path(Export.export()), rtFile) } diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index b6a77f10..08e87909 100644 --- a/scalalib/src/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala @@ -328,7 +328,7 @@ trait ScalaModule extends mill.Module with TaskModule { outer => } def ammoniteReplClasspath = T{ - resolveDeps(T.task{Agg(ivy"com.lihaoyi:::ammonite:1.1.0")})() + resolveDeps(T.task{Agg(ivy"com.lihaoyi:::ammonite:1.1.0-3-73d5734")})() } def repl() = T.command{ if (T.ctx().log.inStream == DummyInputStream){ -- cgit v1.2.3