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

Use IO.getModified over importing the method

This commit is contained in:
Dale Wijnand 2017-12-13 16:54:21 +00:00 committed by Eugene Yokota
parent 46d6b01f79
commit ae99922101
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,6 @@ import java.net.URLClassLoader
import Eval.{ getModule, getValue, WrapValName } import Eval.{ getModule, getValue, WrapValName }
import sbt.io.{ DirectoryFilter, FileFilter, GlobFilter, Hash, IO, Path } import sbt.io.{ DirectoryFilter, FileFilter, GlobFilter, Hash, IO, Path }
import sbt.io.IO.getModifiedTime
// TODO: provide a way to cleanup backing directory // TODO: provide a way to cleanup backing directory
@ -488,11 +487,8 @@ private[sbt] object Eval {
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(try { bytes(try IO.getModifiedTime(f) catch { case _: java.io.FileNotFoundException => 0L })) ++
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)

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

@ -47,7 +47,6 @@ import sbt.io.{
DirectoryFilter, DirectoryFilter,
Hash Hash
}, Path._ }, Path._
import sbt.io.IO.getModifiedTime
import sbt.librarymanagement.Artifact.{ DocClassifier, SourceClassifier } import sbt.librarymanagement.Artifact.{ DocClassifier, SourceClassifier }
import sbt.librarymanagement.Configurations.{ import sbt.librarymanagement.Configurations.{
Compile, Compile,
@ -2316,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 - getModifiedTime(fullUpdateOutput) val diff = now - IO.getModifiedTime(fullUpdateOutput)
val elapsedDuration = new FiniteDuration(diff, TimeUnit.MILLISECONDS) val elapsedDuration = new FiniteDuration(diff, TimeUnit.MILLISECONDS)
fullUpdateOutput.exists() && elapsedDuration > period fullUpdateOutput.exists() && elapsedDuration > period
} }

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

@ -13,7 +13,7 @@ import sbt.internal.librarymanagement._
import sbt.librarymanagement._ import sbt.librarymanagement._
import sbt.librarymanagement.syntax._ import sbt.librarymanagement.syntax._
import sbt.util.{ CacheStore, CacheStoreFactory, Logger, Tracked } import sbt.util.{ CacheStore, CacheStoreFactory, Logger, Tracked }
import sbt.io.IO.getModifiedTime import sbt.io.IO
private[sbt] object LibraryManagement { private[sbt] object LibraryManagement {
@ -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(_ == getModifiedTime(file)) stamps.get(file).forall(_ == IO.getModifiedTime(file))
private[sbt] def transitiveScratch( private[sbt] def transitiveScratch(
lm: DependencyResolution, lm: DependencyResolution,