Merge branch 'master' into restore-master

# Conflicts:
#	.travis.yml
#	scalalib/src/mill/scalalib/Dep.scala

2 files changed, 5 insertions, 5 deletions

diff --git a/main/test/src/mill/eval/JavaCompileJarTests.scala b/main/test/src/mill/eval/JavaCompileJarTests.scala
index 1ac00c79..2e73b339 100644
--- a/main/test/src/mill/eval/JavaCompileJarTests.scala
+++ b/main/test/src/mill/eval/JavaCompileJarTests.scala
@@ -11,10 +11,10 @@ import mill.util.Strict.Agg
 import utest._
 import mill._
 object JavaCompileJarTests extends TestSuite{
-  def compileAll(sources: Seq[PathRef])(implicit ctx: Dest) = {
+  def compileAll(sources: mill.util.Loose.Agg[PathRef])(implicit ctx: Dest) = {
     mkdir(ctx.dest)
     import ammonite.ops._
-    %("javac", sources.map(_.path.toString()), "-d", ctx.dest)(wd = ctx.dest)
+    %("javac", sources.map(_.path.toString()).toSeq, "-d", ctx.dest)(wd = ctx.dest)
     PathRef(ctx.dest)
   }
 
diff --git a/main/test/src/mill/util/ScriptTestSuite.scala b/main/test/src/mill/util/ScriptTestSuite.scala
index a2f2676a..2df1c0c0 100644
--- a/main/test/src/mill/util/ScriptTestSuite.scala
+++ b/main/test/src/mill/util/ScriptTestSuite.scala
@@ -10,8 +10,8 @@ abstract class ScriptTestSuite(fork: Boolean) extends TestSuite{
   def scriptSourcePath: Path
 
   val workspacePath = pwd / 'target / 'workspace / workspaceSlug
-  val stdOutErr = new PrintStream(new ByteArrayOutputStream())
-//  val stdOutErr = new PrintStream(System.out)
+//  val stdOutErr = new PrintStream(new ByteArrayOutputStream())
+  val stdOutErr = new PrintStream(System.out)
   val stdIn = new ByteArrayInputStream(Array())
   lazy val runner = new mill.main.MainRunner(
     ammonite.main.Cli.Config(wd = workspacePath),
@@ -21,7 +21,7 @@ abstract class ScriptTestSuite(fork: Boolean) extends TestSuite{
     if (!fork) runner.runScript(workspacePath / "build.sc", s.toList)
     else{
       try {
-        %%(home / "mill-release", "-i", s)(workspacePath)
+        %(home / "mill-release", "-i", s)(workspacePath)
         true
       }catch{case e: Throwable => false}
     }