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

Moved Milli._ to IO.

This commit is contained in:
Antonio Cunei 2017-12-04 21:22:07 +01:00
parent ccf149e8bf
commit d03dfb3981
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ import java.io.File
import sbt.io.{ IO, Path }
import sbt.io.syntax._
import Path._
import sbt.io.Milli.getModifiedTime
import sbt.io.IO.getModifiedTime
class FileCommands(baseDirectory: File) extends BasicStatementHandler {
lazy val commands = commandMap
@ -68,8 +68,7 @@ class FileCommands(baseDirectory: File) extends BasicStatementHandler {
def newer(a: String, b: String): Unit = {
val pathA = fromString(a)
val pathB = fromString(b)
val isNewer = pathA.exists && (!pathB.exists || getModifiedTime(pathA) > getModifiedTime(
pathB))
val isNewer = pathA.exists && (!pathB.exists || getModifiedTime(pathA) > getModifiedTime(pathB))
if (!isNewer) {
scriptError(s"$pathA is not newer than $pathB")
}

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

@ -8,7 +8,7 @@ import scala.util.control.NonFatal
import sbt.io.Hash
import sjsonnew.{ Builder, JsonFormat, Unbuilder, deserializationError }
import CacheImplicits._
import sbt.io.Milli.getModifiedTime
import sbt.io.IO.getModifiedTime
sealed trait FileInfo { def file: File }
sealed trait HashFileInfo extends FileInfo { def hash: List[Byte] }

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

@ -3,7 +3,7 @@ package sbt.util
import sjsonnew.shaded.scalajson.ast.unsafe._
import sjsonnew._, support.scalajson.unsafe._
import sbt.internal.util.UnitSpec
import sbt.io.Milli.getModifiedTime
import sbt.io.IO.getModifiedTime
class FileInfoSpec extends UnitSpec {
val file = new java.io.File(".").getAbsoluteFile