luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change modifiedTime definitions

This commit is contained in:
Antonio Cunei 2017-12-22 00:03:11 +01:00
parent 8ba68eedfd
commit 0a1bd5a3b2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala
View File

@ -69,7 +69,7 @@ class FileCommands(baseDirectory: File) extends BasicStatementHandler {
val pathA = fromString(a) val pathA = fromString(a)
val pathB = fromString(b) val pathB = fromString(b)
val isNewer = pathA.exists && val isNewer = pathA.exists &&
(!pathB.exists || IO.lastModified(pathA) > IO.lastModified(pathB)) (!pathB.exists || IO.getModifiedTimeOrZero(pathA) > IO.getModifiedTimeOrZero(pathB))
if (!isNewer) { if (!isNewer) {
scriptError(s"$pathA is not newer than $pathB") scriptError(s"$pathA is not newer than $pathB")
} }

4
util-cache/src/main/scala/sbt/util/FileInfo.scala
View File

@ -90,7 +90,7 @@ object FileInfo {
} }
implicit def apply(file: File): HashModifiedFileInfo = implicit def apply(file: File): HashModifiedFileInfo =
FileHashModified(file.getAbsoluteFile, Hash(file).toList, IO.lastModified(file)) FileHashModified(file.getAbsoluteFile, Hash(file).toList, IO.getModifiedTimeOrZero(file))
} }
object hash extends Style { object hash extends Style {
@ -147,7 +147,7 @@ object FileInfo {
} }
implicit def apply(file: File): ModifiedFileInfo = implicit def apply(file: File): ModifiedFileInfo =
FileModified(file.getAbsoluteFile, IO.lastModified(file)) FileModified(file.getAbsoluteFile, IO.getModifiedTimeOrZero(file))
} }
object exists extends Style { object exists extends Style {

2
util-cache/src/test/scala/FileInfoSpec.scala
View File

@ -7,7 +7,7 @@ import sbt.io.IO
class FileInfoSpec extends UnitSpec { class FileInfoSpec extends UnitSpec {
val file = new java.io.File(".").getAbsoluteFile val file = new java.io.File(".").getAbsoluteFile
val fileInfo: ModifiedFileInfo = FileModified(file, IO.lastModified(file)) val fileInfo: ModifiedFileInfo = FileModified(file, IO.getModifiedTimeOrZero(file))
val filesInfo = FilesInfo(Set(fileInfo)) val filesInfo = FilesInfo(Set(fileInfo))
it should "round trip" in assertRoundTrip(filesInfo) it should "round trip" in assertRoundTrip(filesInfo)