merge

com-lihaoyi · Apr 8, 2018 · f0e7dce · f0e7dce
2 parents 5b598b7 + cc04076
commit f0e7dce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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(),