summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-03-31 07:47:08 -0700
committerLi Haoyi <haoyi.sg@gmail.com>2018-03-31 07:47:08 -0700
commitc6572bcf363c1b58142d99c1a7093b67e3fb2e41 (patch)
tree2590f4ee41c5faa6254e894087057a9ea89b44b7
parent924822f85e69d550801362dfb53832757b4db432 (diff)
downloadmill-c6572bcf363c1b58142d99c1a7093b67e3fb2e41.tar.gz
mill-c6572bcf363c1b58142d99c1a7093b67e3fb2e41.tar.bz2
mill-c6572bcf363c1b58142d99c1a7093b67e3fb2e41.zip
fix build
-rwxr-xr-xbuild.sc2
-rw-r--r--core/src/mill/eval/Evaluator.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/build.sc b/build.sc
index a09e0df9..7ceafc2e 100755
--- 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
index 33141c0a..f423092b 100644
--- 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,