From fdf8ee51468895e251d0297afa34829ebaa94a71 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 10 Jul 2015 11:16:19 -0400 Subject: [PATCH] Back out 98d81a62f92b9d13d1c3a658e140ad9daa227261 --- main/src/main/scala/sbt/Defaults.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index efafb00d2..cd05b9c77 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -1411,13 +1411,13 @@ object Classpaths { val outCacheFile = cacheFile / "output" def skipWork: In => UpdateReport = - Tracked.lastOutputWithJson[In, UpdateReport](outCacheFile) { + Tracked.lastOutput[In, UpdateReport](outCacheFile) { case (_, Some(out)) => out case _ => sys.error("Skipping update requested, but update has not previously run successfully.") } def doWork: In => UpdateReport = Tracked.inputChanged(cacheFile / "inputs") { (inChanged: Boolean, in: In) => - val outCache = Tracked.lastOutputWithJson[In, UpdateReport](outCacheFile) { + val outCache = Tracked.lastOutput[In, UpdateReport](outCacheFile) { case (_, Some(out)) if uptodate(inChanged, out) => out case _ => work(in) }