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 index 331d34e93..6aefa4a7a 100644 --- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala +++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala @@ -69,7 +69,7 @@ class FileCommands(baseDirectory: File) extends BasicStatementHandler { val pathA = fromString(a) val pathB = fromString(b) val isNewer = pathA.exists && - (!pathB.exists || IO.getModifiedTime(pathA) > IO.getModifiedTime(pathB)) + (!pathB.exists || IO.getModifiedTimeOrZero(pathA) > IO.getModifiedTimeOrZero(pathB)) if (!isNewer) { scriptError(s"$pathA is not newer than $pathB") } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 453f20649..97e4f992b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,7 +7,7 @@ object Dependencies { val scala211 = "2.11.12" val scala212 = "2.12.4" - private val ioVersion = "1.1.2" + private val ioVersion = "1.1.3" private val sbtIO = "org.scala-sbt" %% "io" % ioVersion diff --git a/project/build.properties b/project/build.properties index 94005e587..394cb75cf 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.0.0 +sbt.version=1.0.4 diff --git a/util-cache/src/main/scala/sbt/util/FileInfo.scala b/util-cache/src/main/scala/sbt/util/FileInfo.scala index 2a26e193d..bef3d6bfd 100644 --- a/util-cache/src/main/scala/sbt/util/FileInfo.scala +++ b/util-cache/src/main/scala/sbt/util/FileInfo.scala @@ -51,11 +51,6 @@ object FilesInfo { object FileInfo { - // 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 @@ -95,7 +90,7 @@ object FileInfo { } implicit def apply(file: File): HashModifiedFileInfo = - FileHashModified(file.getAbsoluteFile, Hash(file).toList, getModifiedTimeOrZero(file)) + FileHashModified(file.getAbsoluteFile, Hash(file).toList, IO.getModifiedTimeOrZero(file)) } object hash extends Style { @@ -152,7 +147,7 @@ object FileInfo { } implicit def apply(file: File): ModifiedFileInfo = - FileModified(file.getAbsoluteFile, getModifiedTimeOrZero(file)) + FileModified(file.getAbsoluteFile, IO.getModifiedTimeOrZero(file)) } object exists extends Style { diff --git a/util-cache/src/test/scala/FileInfoSpec.scala b/util-cache/src/test/scala/FileInfoSpec.scala index 62e941254..7b0f3e035 100644 --- a/util-cache/src/test/scala/FileInfoSpec.scala +++ b/util-cache/src/test/scala/FileInfoSpec.scala @@ -7,7 +7,7 @@ import sbt.io.IO class FileInfoSpec extends UnitSpec { val file = new java.io.File(".").getAbsoluteFile - val fileInfo: ModifiedFileInfo = FileModified(file, IO.getModifiedTime(file)) + val fileInfo: ModifiedFileInfo = FileModified(file, IO.getModifiedTimeOrZero(file)) val filesInfo = FilesInfo(Set(fileInfo)) it should "round trip" in assertRoundTrip(filesInfo)