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 /build.sc | |
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
Diffstat (limited to 'build.sc')
-rwxr-xr-x | build.sc | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -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 %* |) |