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

Convert lastModified/setLastModified calls to sbt.io.Milli calls (more precise)

This commit is contained in:
Antonio Cunei 2017-11-30 04:22:15 +01:00 committed by Eugene Yokota
parent 858f918a19
commit ca2617e99e
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/scala/sbt/librarymanagement/RichUpdateReport.scala
View File

@ -2,6 +2,7 @@ package sbt
package librarymanagement package librarymanagement
import java.io.File import java.io.File
import sbt.io.Milli.getModifiedTime
/** /**
* Provides extra methods for filtering the contents of an `UpdateReport` * Provides extra methods for filtering the contents of an `UpdateReport`
@ -10,7 +11,7 @@ import java.io.File
final class RichUpdateReport(report: UpdateReport) { final class RichUpdateReport(report: UpdateReport) {
private[sbt] def recomputeStamps(): UpdateReport = { private[sbt] def recomputeStamps(): UpdateReport = {
val files = report.cachedDescriptor +: allFiles val files = report.cachedDescriptor +: allFiles
val stamps = files.map(f => (f, f.lastModified)).toMap val stamps = files.map(f => (f, getModifiedTime(f))).toMap
UpdateReport(report.cachedDescriptor, report.configurations, report.stats, stamps) UpdateReport(report.cachedDescriptor, report.configurations, report.stats, stamps)
} }

3
ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/GigahorseUrlHandler.scala
View File

@ -16,6 +16,7 @@ import org.apache.ivy.util.{ CopyProgressEvent, CopyProgressListener, Message }
import org.apache.ivy.util.url.{ AbstractURLHandler, BasicURLHandler, IvyAuthenticator, URLHandler } import org.apache.ivy.util.url.{ AbstractURLHandler, BasicURLHandler, IvyAuthenticator, URLHandler }
import org.apache.ivy.util.url.URLHandler._ import org.apache.ivy.util.url.URLHandler._
import sbt.io.IO import sbt.io.IO
import sbt.io.Milli.setModifiedTime
// Copied from Ivy's BasicURLHandler. // Copied from Ivy's BasicURLHandler.
class GigahorseUrlHandler extends AbstractURLHandler { class GigahorseUrlHandler extends AbstractURLHandler {
@ -149,7 +150,7 @@ class GigahorseUrlHandler extends AbstractURLHandler {
val lastModified = lastModifiedTimestamp(response) val lastModified = lastModifiedTimestamp(response)
if (lastModified > 0) { if (lastModified > 0) {
dest.setLastModified(lastModified) setModifiedTime(dest, lastModified)
} }
if (l != null) { if (l != null) {

2
project/Util.scala
View File

@ -26,6 +26,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
// has been upgraded to a version of sbt that includes sbt.io.Milli.
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)