diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-03-26 19:39:24 -0700 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-03-26 19:39:24 -0700 |
commit | c27a29058e990c5aa965bf71e19290de7f9793b4 (patch) | |
tree | bfde0ef97dfad873e1034af6be9a05be9b0e3d3b | |
parent | ae1e499cbb5b710a5a4e7dd8536a42c22631e84d (diff) | |
parent | ea2fdd93d6cec3c3eab1124ed3792c3ad6f2c484 (diff) | |
download | mill-c27a29058e990c5aa965bf71e19290de7f9793b4.tar.gz mill-c27a29058e990c5aa965bf71e19290de7f9793b4.tar.bz2 mill-c27a29058e990c5aa965bf71e19290de7f9793b4.zip |
Merge branch 'master' of github.com:lihaoyi/mill
-rw-r--r-- | .appveyor.yml | 4 | ||||
-rw-r--r-- | .travis.yml | 2 | ||||
-rwxr-xr-x | build.sc | 11 | ||||
-rw-r--r-- | clientserver/src/mill/clientserver/Client.java | 2 | ||||
-rw-r--r-- | core/src/mill/util/ClassLoader.scala | 2 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/ScalaModule.scala | 2 |
6 files changed, 9 insertions, 14 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 781a0c1f..e353b6a6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -27,7 +27,7 @@ cache: - '%LOCALAPPDATA%\Coursier\cache' install: - - SET MILL_URL=https://github.com/lihaoyi/mill/releases/download/0.1.6/0.1.6-3-43d230 + - SET MILL_URL=https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7-8-b913c6 build_script: - if [%COMPILER%]==[msys2] ( @@ -36,7 +36,7 @@ build_script: C:\%MSYS2_DIR%\usr\bin\bash -lc "curl -Lo /usr/local/bin/mill %MILL_URL%" && C:\%MSYS2_DIR%\usr\bin\bash -lc 'chmod +x /usr/local/bin/mill' && C:\%MSYS2_DIR%\usr\bin\bash -lc "cd /c/mill && mill -i all __.publishLocal release" && - C:\%MSYS2_DIR%\usr\bin\bash -lc "cd /c/mill && out/release/dest/mill all main.test scalajslib.test") + C:\%MSYS2_DIR%\usr\bin\bash -lc "cd /c/mill && out/release/dest/mill -i all main.test scalajslib.test") - if [%COMPILER%]==[cygwin] ( SET "PATH=%JAVA_HOME%\bin;C:\%CYGWIN_DIR%\bin;C:\%CYGWIN_DIR%\usr\bin;%PATH%" && C:\%CYGWIN_DIR%\bin\bash -lc 'mkdir -p /usr/local/bin' && diff --git a/.travis.yml b/.travis.yml index 8d34956d..b63d7028 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ matrix: jdk: oraclejdk8 script: - - curl -L -o ~/bin/mill https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7 && chmod +x ~/bin/mill + - curl -L -o ~/bin/mill https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7-8-b913c6 && chmod +x ~/bin/mill - export PATH=~/bin/mill:$PATH - "$CI_SCRIPT" @@ -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 { @@ -214,12 +214,7 @@ def launcherScript(isWin: Boolean, |if "%1" == "-i" set _I_=true |if "%1" == "--interactive" set _I_=true |if defined _I_ ( - | if "%2" == "" ( - | echo mill repl is currently only available on a sh environment - | exit /B 1 - | ) else ( - | java $jvmArgsStr %JAVA_OPTS% -cp "$classPathStr" mill.Main %* - | ) + | java $jvmArgsStr %JAVA_OPTS% -cp "$classPathStr" mill.Main %* |) else ( | java $jvmArgsStr %JAVA_OPTS% -cp "$classPathStr" mill.clientserver.Client %* |) diff --git a/clientserver/src/mill/clientserver/Client.java b/clientserver/src/mill/clientserver/Client.java index 261f69b1..e2a92f7f 100644 --- a/clientserver/src/mill/clientserver/Client.java +++ b/clientserver/src/mill/clientserver/Client.java @@ -112,7 +112,7 @@ public class Client { // Need to give sometime for Win32NamedPipeSocket to work // if the server is just initialized - if (serverInit && ClientServer.isWindows) Thread.sleep(250); + if (serverInit && ClientServer.isWindows) Thread.sleep(1000); Socket ioSocket = null; 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 a2ca2214..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.0.5-7-f032887")})() + resolveDeps(T.task{Agg(ivy"com.lihaoyi:::ammonite:1.1.0-3-73d5734")})() } def repl() = T.command{ if (T.ctx().log.inStream == DummyInputStream){ |