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

Merge pull request #135 from eed3si9n/wip/1.1.1 

bump plugins
This commit is contained in:
eugene yokota 2017-12-15 13:50:59 -05:00 committed by GitHub
parent b3e217aa6e e835ce0689
commit 8b6ccd61db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 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.getModifiedTime(pathA) > IO.getModifiedTime(pathB)) (!pathB.exists || IO.getModifiedTime(pathA) > IO.getModifiedTime(pathB))
if (!isNewer) { if (!isNewer) {
scriptError(s"$pathA is not newer than $pathB") scriptError(s"$pathA is not newer than $pathB")
} }

6
project/plugins.sbt
View File

@ -1,4 +1,2 @@
addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.3") addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.4")
addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.0") addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.2")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.17")
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.14")