From 0d16d730cbdf31b2f88ca602fac73bf1bf622a90 Mon Sep 17 00:00:00 2001 From: Ahir Reddy Date: Wed, 17 Apr 2019 14:21:36 -0700 Subject: Revert Zinc to 1.2.5 to match release notes (#594) --- build.sc | 2 +- scalalib/worker/src/ZincWorkerImpl.scala | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build.sc b/build.sc index bc693f1c..eb91022b 100755 --- a/build.sc +++ b/build.sc @@ -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 { -- cgit v1.2.3