diff options
author | Ahir Reddy <ahirreddy@gmail.com> | 2019-04-17 14:21:36 -0700 |
---|---|---|
committer | Tobias Roeser <le.petit.fou@web.de> | 2019-04-17 23:21:36 +0200 |
commit | 0d16d730cbdf31b2f88ca602fac73bf1bf622a90 (patch) | |
tree | e58bd2efd7c149f267438ddd52f7ef8d0e0797c1 | |
parent | ddd54c7bb4b79277684ed47bd35ec33d139aaf5a (diff) | |
download | mill-0d16d730cbdf31b2f88ca602fac73bf1bf622a90.tar.gz mill-0d16d730cbdf31b2f88ca602fac73bf1bf622a90.tar.bz2 mill-0d16d730cbdf31b2f88ca602fac73bf1bf622a90.zip |
Revert Zinc to 1.2.5 to match release notes (#594)
-rwxr-xr-x | build.sc | 2 | ||||
-rw-r--r-- | scalalib/worker/src/ZincWorkerImpl.scala | 3 |
2 files changed, 2 insertions, 3 deletions
@@ -187,7 +187,7 @@ object scalalib extends MillModule { def ivyDeps = Agg( // Keep synchronized with zinc in Versions.scala - ivy"org.scala-sbt::zinc:1.3.0-M1" + ivy"org.scala-sbt::zinc:1.2.5" ) def testArgs = T{Seq( "-DMILL_SCALA_WORKER=" + runClasspath().map(_.path).mkString(",") diff --git a/scalalib/worker/src/ZincWorkerImpl.scala b/scalalib/worker/src/ZincWorkerImpl.scala index a127e96e..30f6b834 100644 --- a/scalalib/worker/src/ZincWorkerImpl.scala +++ b/scalalib/worker/src/ZincWorkerImpl.scala @@ -336,8 +336,7 @@ class ZincWorkerImpl(compilerBridge: Either[ pr = { val prev = store.get() PreviousResult.of(prev.map(_.getAnalysis), prev.map(_.getMiniSetup)) - }, - Optional.empty[java.io.File] + } ) try { |