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

Revert *ModifiedTime() calls to *lastModified*() calls 

There are just too many instances in which sbt's code relies on
the `lastModified`/`setLastModified` semantics, so instead of moving
to `get`/`setModifiedTime`, we use new IO calls that offer the new
timestamp precision, but retain the old semantics.
This commit is contained in:
Antonio Cunei 2017-12-18 17:37:03 +01:00
parent bef5c9c996
commit ebff7919e9
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main-actions/src/main/scala/sbt/compiler/Eval.scala
View File

@ -485,12 +485,11 @@ private[sbt] object Eval {
def filesModifiedBytes(fs: Array[File]): Array[Byte] = def filesModifiedBytes(fs: Array[File]): Array[Byte] =
if (fs eq null) filesModifiedBytes(Array[File]()) else seqBytes(fs)(fileModifiedBytes) if (fs eq null) filesModifiedBytes(Array[File]()) else seqBytes(fs)(fileModifiedBytes)
def fileModifiedBytes(f: File): Array[Byte] = def fileModifiedBytes(f: File): Array[Byte] =
(if (f.isDirectory) filesModifiedBytes(f listFiles classDirFilter) (if (f.isDirectory)
filesModifiedBytes(f listFiles classDirFilter)
else else
bytes( bytes(IO.lastModified(f))
try IO.getModifiedTime(f) ) ++ bytes(f.getAbsolutePath)
catch { case _: java.io.FileNotFoundException => 0L })) ++
bytes(f.getAbsolutePath)
def fileExistsBytes(f: File): Array[Byte] = def fileExistsBytes(f: File): Array[Byte] =
bytes(f.exists) ++ bytes(f.exists) ++
bytes(f.getAbsolutePath) bytes(f.getAbsolutePath)

2
main/src/main/scala/sbt/Defaults.scala
View File

@ -2315,7 +2315,7 @@ object Classpaths {
case Some(period) => case Some(period) =>
val fullUpdateOutput = cacheDirectory / "out" val fullUpdateOutput = cacheDirectory / "out"
val now = System.currentTimeMillis val now = System.currentTimeMillis
val diff = now - IO.getModifiedTime(fullUpdateOutput) val diff = now - IO.lastModified(fullUpdateOutput)
val elapsedDuration = new FiniteDuration(diff, TimeUnit.MILLISECONDS) val elapsedDuration = new FiniteDuration(diff, TimeUnit.MILLISECONDS)
fullUpdateOutput.exists() && elapsedDuration > period fullUpdateOutput.exists() && elapsedDuration > period
} }

2
main/src/main/scala/sbt/internal/LibraryManagement.scala
View File

@ -127,7 +127,7 @@ private[sbt] object LibraryManagement {
} }
private[this] def fileUptodate(file: File, stamps: Map[File, Long]): Boolean = private[this] def fileUptodate(file: File, stamps: Map[File, Long]): Boolean =
stamps.get(file).forall(_ == IO.getModifiedTime(file)) stamps.get(file).forall(_ == IO.lastModified(file))
private[sbt] def transitiveScratch( private[sbt] def transitiveScratch(
lm: DependencyResolution, lm: DependencyResolution,

4
project/SiteMap.scala
View File

@ -68,8 +68,8 @@ object SiteMap {
// generates a string suitable for a sitemap file representing the last modified time of the given File // generates a string suitable for a sitemap file representing the last modified time of the given File
private[this] def lastModifiedString(f: File): String = { private[this] def lastModifiedString(f: File): String = {
val formatter = new java.text.SimpleDateFormat("yyyy-MM-dd") val formatter = new java.text.SimpleDateFormat("yyyy-MM-dd")
// TODO: replace lastModified() with sbt.io.Milli.getModifiedTime(), once the build // TODO: replace lastModified() with sbt.io.IO.lastModified(), once the build
// has been upgraded to a version of sbt that includes sbt.io.Milli. // has been upgraded to a version of sbt that includes that call.
formatter.format(new java.util.Date(f.lastModified)) formatter.format(new java.util.Date(f.lastModified))
} }
// writes the provided XML node to `output` and then gzips it to `gzipped` if `gzip` is true // writes the provided XML node to `output` and then gzips it to `gzipped` if `gzip` is true

4
project/Util.scala
View File

@ -105,8 +105,8 @@ object Util {
val timestamp = formatter.format(new Date) val timestamp = formatter.format(new Date)
val content = versionLine(version) + "\ntimestamp=" + timestamp val content = versionLine(version) + "\ntimestamp=" + timestamp
val f = dir / "xsbt.version.properties" val f = dir / "xsbt.version.properties"
// TODO: replace lastModified() with sbt.io.Milli.getModifiedTime(), once the build // TODO: replace lastModified() with sbt.io.IO.lastModified(), once the build
// has been upgraded to a version of sbt that includes sbt.io.Milli. // has been upgraded to a version of sbt that includes that call.
if (!f.exists || f.lastModified < lastCompilationTime(analysis) || !containsVersion(f, version)) { if (!f.exists || f.lastModified < lastCompilationTime(analysis) || !containsVersion(f, version)) {
s.log.info("Writing version information to " + f + " :\n" + content) s.log.info("Writing version information to " + f + " :\n" + content)
IO.write(f, content) IO.write(f, content)