diff --git a/main-actions/src/main/scala/sbt/compiler/Eval.scala b/main-actions/src/main/scala/sbt/compiler/Eval.scala index a628e5959..f756d92b8 100644 --- a/main-actions/src/main/scala/sbt/compiler/Eval.scala +++ b/main-actions/src/main/scala/sbt/compiler/Eval.scala @@ -21,7 +21,6 @@ import java.net.URLClassLoader import Eval.{ getModule, getValue, WrapValName } import sbt.io.{ DirectoryFilter, FileFilter, GlobFilter, Hash, IO, Path } -import sbt.io.IO.getModifiedTime // TODO: provide a way to cleanup backing directory @@ -488,11 +487,8 @@ private[sbt] object Eval { def fileModifiedBytes(f: File): Array[Byte] = (if (f.isDirectory) filesModifiedBytes(f listFiles classDirFilter) else - bytes(try { - getModifiedTime(f) - } catch { - case _: java.io.FileNotFoundException => 0L - })) ++ bytes(f.getAbsolutePath) + bytes(try IO.getModifiedTime(f) catch { case _: java.io.FileNotFoundException => 0L })) ++ + bytes(f.getAbsolutePath) def fileExistsBytes(f: File): Array[Byte] = bytes(f.exists) ++ bytes(f.getAbsolutePath) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index abe66d6be..b006c115d 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -47,7 +47,6 @@ import sbt.io.{ DirectoryFilter, Hash }, Path._ -import sbt.io.IO.getModifiedTime import sbt.librarymanagement.Artifact.{ DocClassifier, SourceClassifier } import sbt.librarymanagement.Configurations.{ Compile, @@ -2316,7 +2315,7 @@ object Classpaths { case Some(period) => val fullUpdateOutput = cacheDirectory / "out" val now = System.currentTimeMillis - val diff = now - getModifiedTime(fullUpdateOutput) + val diff = now - IO.getModifiedTime(fullUpdateOutput) val elapsedDuration = new FiniteDuration(diff, TimeUnit.MILLISECONDS) fullUpdateOutput.exists() && elapsedDuration > period } diff --git a/main/src/main/scala/sbt/internal/LibraryManagement.scala b/main/src/main/scala/sbt/internal/LibraryManagement.scala index 2849ce17b..fc832ffff 100644 --- a/main/src/main/scala/sbt/internal/LibraryManagement.scala +++ b/main/src/main/scala/sbt/internal/LibraryManagement.scala @@ -13,7 +13,7 @@ import sbt.internal.librarymanagement._ import sbt.librarymanagement._ import sbt.librarymanagement.syntax._ import sbt.util.{ CacheStore, CacheStoreFactory, Logger, Tracked } -import sbt.io.IO.getModifiedTime +import sbt.io.IO private[sbt] object LibraryManagement { @@ -127,7 +127,7 @@ private[sbt] object LibraryManagement { } private[this] def fileUptodate(file: File, stamps: Map[File, Long]): Boolean = - stamps.get(file).forall(_ == getModifiedTime(file)) + stamps.get(file).forall(_ == IO.getModifiedTime(file)) private[sbt] def transitiveScratch( lm: DependencyResolution,