Merge pull request #1 from dwijnand/wip-milli

Use IO.getModified over importing the method
sbt · Dec 15, 2017 · d172453 · d172453
2 parents cd4346c + 13a8d53
commit d172453
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala b/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala
@@ -68,7 +68,8 @@ class FileCommands(baseDirectory: File) extends BasicStatementHandler {
   def newer(a: String, b: String): Unit = {
     val pathA = fromString(a)
     val pathB = fromString(b)
-    val isNewer = pathA.exists && (!pathB.exists || getModifiedTime(pathA) > getModifiedTime(pathB))
+    val isNewer = pathA.exists &&
+        (!pathB.exists || IO.getModifiedTime(pathA) > IO.getModifiedTime(pathB))
     if (!isNewer) {
       scriptError(s"$pathA is not newer than $pathB")
     }

diff --git a/util-cache/src/main/scala/sbt/util/FileInfo.scala b/util-cache/src/main/scala/sbt/util/FileInfo.scala
@@ -6,10 +6,9 @@ package sbt.util
 import java.io.File
 import java.io.FileNotFoundException
 import scala.util.control.NonFatal
-import sbt.io.Hash
+import sbt.io.{ Hash, IO }
 import sjsonnew.{ Builder, JsonFormat, Unbuilder, deserializationError }
 import CacheImplicits._
-import sbt.io.IO.getModifiedTime
 
 sealed trait FileInfo { def file: File }
 sealed trait HashFileInfo extends FileInfo { def hash: List[Byte] }
@@ -52,13 +51,10 @@ object FilesInfo {
 
 object FileInfo {
 
-  def getModifiedTimeOrZero(file: File) = { // returns 0L if file does not exist
-    try {
-      getModifiedTime(file)
-    } catch {
-      case _: FileNotFoundException => 0L
-    }
-  }
+  // returns 0L if file does not exist
+  private def getModifiedTimeOrZero(file: File) =
+    try IO.getModifiedTime(file)
+    catch { case _: FileNotFoundException => 0L }
 
   sealed trait Style {
     type F <: FileInfo