diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-07 21:53:13 -0700 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-07 22:36:39 -0700 |
commit | f0e7dcefb312d9e64f2aedca867f940aebe5d59c (patch) | |
tree | df49037a6031935477c3796e6468e470b5ba9220 | |
parent | 5b598b7ee7cdec3bccf797c9a5f7ddd768ec62c2 (diff) | |
parent | cc0407681d3d25979b227a50b52495f31773e175 (diff) | |
download | mill-f0e7dcefb312d9e64f2aedca867f940aebe5d59c.tar.gz mill-f0e7dcefb312d9e64f2aedca867f940aebe5d59c.tar.bz2 mill-f0e7dcefb312d9e64f2aedca867f940aebe5d59c.zip |
merge
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/JavaModule.scala | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 7f08a15c..3a7f5fdb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ matrix: jdk: oraclejdk8 script: - - curl -L -o ~/bin/mill https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7-52-9c0564 && chmod +x ~/bin/mill + - curl -L -o ~/bin/mill https://github.com/lihaoyi/mill/releases/download/0.1.7/0.1.7-53-cc0407 && chmod +x ~/bin/mill - export PATH=~/bin/mill:$PATH - "$CI_SCRIPT" diff --git a/scalalib/src/mill/scalalib/JavaModule.scala b/scalalib/src/mill/scalalib/JavaModule.scala index 633758e7..b8ae0fd4 100644 --- a/scalalib/src/mill/scalalib/JavaModule.scala +++ b/scalalib/src/mill/scalalib/JavaModule.scala @@ -195,7 +195,10 @@ trait JavaModule extends mill.Module with TaskModule { outer => ) ++ options ++ Seq( "-classpath", - compileClasspath().map(_.path).filter(_.ext != "pom").mkString(java.io.File.pathSeparator) + compileClasspath() + .map(_.path) + .filter(_.ext != "pom") + .mkString(java.io.File.pathSeparator) ) ++ files.map(_.toString), envArgs = Map(), |