summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-04-08 12:57:59 -0700
committerLi Haoyi <haoyi.sg@gmail.com>2018-04-08 15:06:43 -0700
commitbcdb1aaf941a00a52fc854a5fbced81b2fda96d9 (patch)
tree2c02d0a6bd395d77533269ecebb8044e031d435a
parent62a18754179d74252668879c42e1c5d6a45fbdce (diff)
downloadmill-bcdb1aaf941a00a52fc854a5fbced81b2fda96d9.tar.gz
mill-bcdb1aaf941a00a52fc854a5fbced81b2fda96d9.tar.bz2
mill-bcdb1aaf941a00a52fc854a5fbced81b2fda96d9.zip
bump zinc version
-rwxr-xr-xbuild.sc2
-rw-r--r--scalalib/src/mill/scalalib/ScalaModule.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/build.sc b/build.sc
index a86d7d75..76fe8b9b 100755
--- a/build.sc
+++ b/build.sc
@@ -112,7 +112,7 @@ object scalaworker extends MillModule{
def moduleDeps = Seq(main, scalalib)
def ivyDeps = Agg(
- ivy"org.scala-sbt::zinc:1.0.5"
+ ivy"org.scala-sbt::zinc:1.1.4"
)
def testArgs = Seq(
"-DMILL_SCALA_WORKER=" + runClasspath().map(_.path).mkString(",")
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index a2ca09c5..c499dda5 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/mill/scalalib/ScalaModule.scala
@@ -25,7 +25,7 @@ trait ScalaModule extends JavaModule { outer =>
override def scalacOptions = outer.scalacOptions
override def javacOptions = outer.javacOptions
override def scalaWorker = outer.scalaWorker
- override def moduleDeps = Seq(outer)
+ override def moduleDeps: Seq[JavaModule] = Seq(outer)
}
def scalaVersion: T[String]