From 5dd1e6adc39d9b57af61a43444558723aa397b7c Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 29 Jul 2018 20:34:40 -0400 Subject: [PATCH 1/3] Util 1.2.0 --- project/Dependencies.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 73b38a1df..8464f2507 100644 --- a/project/Dependencies.scala +++ b/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 From 98f15d8c8acaab062c04ffb08860be174fa022e3 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Wed, 1 Aug 2018 00:13:09 -0400 Subject: [PATCH 2/3] 1.2.1-SNAPSHOT --- build.sbt | 3 ++- project/build.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 591b02d1f..b28c7bea6 100644 --- a/build.sbt +++ b/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" diff --git a/project/build.properties b/project/build.properties index d6e35076c..f59579fd6 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.6 +sbt.version=1.2.0 From 081ca94e6138fdade1fe01e5840ba669c2d8be2b Mon Sep 17 00:00:00 2001 From: Philippus Baalman Date: Tue, 28 Aug 2018 16:25:27 +0200 Subject: [PATCH 3/3] Fix typo --- .../scala/sbt/internal/librarymanagement/ConvertResolver.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala index 545a8f9f6..2c9a79357 100644 --- a/ivy/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala +++ b/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.