Merge branch '1.2.x' into wip/merge-1.2.x

build.sbt

@@ -37,6 +37,7 @@ val mimaSettings = Def settings (
   mimaPreviousArtifacts := Set(
     "1.0.0", "1.0.1", "1.0.2", "1.0.3", "1.0.4",
     "1.1.0", "1.1.1", "1.1.2", "1.1.3", "1.1.4",
+    "1.2.0",
   ) map (version =>
     organization.value %% moduleName.value % version
       cross (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled)
@@ -56,7 +57,7 @@ lazy val lmRoot = (project in file("."))
         },
         bintrayPackage := "librarymanagement",
         scalafmtOnCompile in Sbt := false,
-        git.baseVersion := "1.2.0",
+        git.baseVersion := "1.2.1",
         version := {
           val v = version.value
           if (v contains "SNAPSHOT") git.baseVersion.value + "-SNAPSHOT"

ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala

@@ -393,7 +393,7 @@ private[sbt] object ConvertResolver {
         // This error could be thrown either by super.put or the above
         case ex: IOException if ex.getMessage.contains("destination file exists") =>
           throw new IOException(
-            s"""PUT operation failed because the desitnation file exists and overwriting is disabled:
+            s"""PUT operation failed because the destination file exists and overwriting is disabled:
                |    source     : $source
                |    destination: $destination
                |If you have a staging repository that has failed, drop it and start over.

project/Dependencies.scala

@@ -6,8 +6,8 @@ object Dependencies {
   val scala211 = "2.11.12"
   val scala212 = "2.12.6"
 
-  private val ioVersion = "1.2.0-M2"
-  private val utilVersion = "1.2.0-M1"
+  private val ioVersion = "1.2.0"
+  private val utilVersion = "1.2.0"
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.3
+sbt.version=1.2.0