Merge pull request #198 from sbt/1.1.x

Merge 1.1.x into 1.x

build.sbt

@@ -30,7 +30,13 @@ def commonSettings: Seq[Setting[_]] = Seq(
 )
 
 val mimaSettings = Def settings (
-  mimaPreviousArtifacts := Set(organization.value %% moduleName.value % "1.0.0"),
+  mimaPreviousArtifacts := Set(
+    "1.0.0", "1.0.1", "1.0.2", "1.0.3", "1.0.4",
+    "1.1.0", "1.1.1",
+  ) map (version =>
+    organization.value %% moduleName.value % version
+      cross (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled)
+  ),
   mimaBinaryIssueFilters ++= {
     import com.typesafe.tools.mima.core._
     import com.typesafe.tools.mima.core.ProblemFilters._
@@ -54,9 +60,7 @@ lazy val lmRoot = (project in file("."))
           Some(ScmInfo(url(s"https://github.com/$slug"), s"git@github.com:$slug.git"))
         },
         bintrayPackage := "librarymanagement",
-        scalafmtOnCompile := true,
         scalafmtOnCompile in Sbt := false,
-        scalafmtVersion := "1.2.0",
         git.baseVersion := baseVersion,
         version := {
           val v = version.value

core/src/main/scala/sbt/librarymanagement/RichUpdateReport.scala

@@ -16,12 +16,11 @@ final class RichUpdateReport(report: UpdateReport) {
       .map(
         f =>
           (f,
-           // TODO: this used to be a lastModified(), without error checking.
-           // On occasion, "files" contains files like "./target/ivyhome/resolution-cache/com.example/foo/0.4.0/resolved.xml.xml",
-           // which do not actually exist, so getModifiedTime() correctly throws an exception. For the moment, the behavior of
-           // lastModified() is reproduced, but the non-existent file should really not be there to begin with. so, FIXME.
-           try IO.getModifiedTime(f)
-           catch { case _: FileNotFoundException => 0L })
+           // TODO: The list of files may also contain some odd files that do not actually exist like:
+           // "./target/ivyhome/resolution-cache/com.example/foo/0.4.0/resolved.xml.xml".
+           // IO.getModifiedTimeOrZero() will just return zero, but the list of files should not contain such
+           // files to begin with, in principle.
+           IO.getModifiedTimeOrZero(f))
       )
       .toMap
     UpdateReport(report.cachedDescriptor, report.configurations, report.stats, stamps)

ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/GigahorseUrlHandler.scala

@@ -149,7 +149,7 @@ class GigahorseUrlHandler extends AbstractURLHandler {
 
       val lastModified = lastModifiedTimestamp(response)
       if (lastModified > 0) {
-        IO.setModifiedTime(dest, lastModified)
+        IO.setModifiedTimeOrFalse(dest, lastModified)
       }
 
       if (l != null) {

project/Dependencies.scala

@@ -6,8 +6,8 @@ object Dependencies {
   val scala211 = "2.11.12"
   val scala212 = "2.12.4"
 
-  private val ioVersion = "1.1.2"
-  private val utilVersion = "1.1.1"
+  private val ioVersion = "1.1.3"
+  private val utilVersion = "1.1.2"
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
 

project/Util.scala

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

project/build.properties

@@ -1 +1 @@
-sbt.version=1.0.0
+sbt.version=1.0.4

project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.4")
+addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.5")
 addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.2")
 
 scalacOptions += "-language:postfixOps"