fix build

com-lihaoyi · Apr 6, 2018 · 779e453 · 779e453
1 parent 924822f
commit 779e453
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/build.sc b/build.sc
@@ -232,7 +232,7 @@ def launcherScript(jvmArgs: Seq[String],
   universalScript(
     shellCommands = {
       def java(mainClass: String) =
-        s"""exec java $jvmArgsStr $$JAVA_OPTS -cp "${shellClassPath.mkString(":")}" mill.Main "$$@""""
+        s"""exec java $jvmArgsStr $$JAVA_OPTS -cp "${shellClassPath.mkString(":")}" $mainClass "$$@""""
 
       s"""case "$$1" in
          |  -i | --interactive )

diff --git a/core/src/mill/eval/Evaluator.scala b/core/src/mill/eval/Evaluator.scala
@@ -353,7 +353,7 @@ object Evaluator{
   def classLoaderSig = Thread.currentThread().getContextClassLoader match {
     case scl: SpecialClassLoader => scl.classpathSignature
     case ucl: URLClassLoader =>
-      SpecialClassLoader.initialClasspathSignature(ucl).map{ case (k, v) => (Right(k), v)}
+      SpecialClassLoader.initialClasspathSignature(ucl)
     case _ => Nil
   }
   case class Timing(label: String,

diff --git 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/scalalib/test/src/mill/scalalib/publish/IvyTests.scala b/scalalib/test/src/mill/scalalib/publish/IvyTests.scala
@@ -26,9 +26,9 @@ object IvyTests extends TestSuite {
       'topLevel - {
         val info = singleNode(fullIvy \ "info")
         assert(
-          singleAttr(info, "organisation") == artifact.group
-        , singleAttr(info, "module") == artifact.id
-        , singleAttr(info, "revision") == artifact.version
+          singleAttr(info, "organisation") == artifact.group,
+          singleAttr(info, "module") == artifact.id,
+          singleAttr(info, "revision") == artifact.version
         )
       }
 
@@ -40,10 +40,10 @@ object IvyTests extends TestSuite {
 
         dependencies.zipWithIndex.foreach { case (dep, index) =>
           assert(
-            singleAttr(dep, "org") == ivyDeps(index).artifact.group
-          , singleAttr(dep, "name") == ivyDeps(index).artifact.id
-          , singleAttr(dep, "rev") == ivyDeps(index).artifact.version
-          , (dep \ "exclude").zipWithIndex forall { case (exclude, j) =>
+            singleAttr(dep, "org") == ivyDeps(index).artifact.group,
+            singleAttr(dep, "name") == ivyDeps(index).artifact.id,
+            singleAttr(dep, "rev") == ivyDeps(index).artifact.version,
+            (dep \ "exclude").zipWithIndex forall { case (exclude, j) =>
               singleAttr(exclude, "org") == ivyDeps(index).exclusions(j)._1 &&
                 singleAttr(exclude, "name") == ivyDeps(index).exclusions(j)._2
             }