diff --git a/.travis.yml b/.travis.yml index 35032ab26..e82edd618 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,12 @@ jdk: oraclejdk8 scala: - 2.11.12 - - 2.12.4 + - 2.12.7 matrix: include: - - scala: 2.12.4 - jdk: oraclejdk9 + - scala: 2.12.7 + jdk: openjdk11 script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M ++$TRAVIS_SCALA_VERSION diff --git a/build.sbt b/build.sbt index 0dc52aefe..cc86bbd37 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.3.0", version := { val v = version.value if (v contains "SNAPSHOT") git.baseVersion.value + "-SNAPSHOT" 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. diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala index b50914ea9..0312e573b 100644 --- a/ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala +++ b/ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala @@ -842,7 +842,7 @@ private[sbt] object IvySbt { }) foreach { case (_, vs) if vs.size > 1 => val v0 = vs.head - (vs find { _.revision != v0.revision }) foreach { v => + (vs find { _.revision != v0.revision }) foreach { _ => out += s" * ${v0.organization}:${v0.name}:(" + (vs map { _.revision }) .mkString(", ") + ")" } diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala index 72a3490dd..700bc0ddb 100644 --- a/ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala +++ b/ivy/src/main/scala/sbt/internal/librarymanagement/IvyActions.scala @@ -30,7 +30,7 @@ object IvyActions { /** Installs the dependencies of the given 'module' from the resolver named 'from' to the resolver named 'to'.*/ def install(module: IvySbt#Module, from: String, to: String, log: Logger): Unit = { - module.withModule(log) { (ivy, md, default) => + module.withModule(log) { (ivy, md, _) => for (dependency <- md.getDependencies) { log.info("Installing " + dependency) val options = new InstallOptions @@ -68,7 +68,7 @@ object IvyActions { val file = configuration.file.getOrElse(sys.error("file must be specified.")) val moduleInfo = configuration.moduleInfo.getOrElse(sys.error("moduleInfo must be specified.")) val extra = configuration.extra.getOrElse(scala.xml.NodeSeq.Empty) - module.withModule(log) { (ivy, md, default) => + module.withModule(log) { (ivy, md, _) => (new MakePom(log)).write( ivy, md, diff --git a/ivy/src/main/scala/sbt/internal/librarymanagement/IvyScalaUtil.scala b/ivy/src/main/scala/sbt/internal/librarymanagement/IvyScalaUtil.scala index bc53f3256..3848bc0d1 100644 --- a/ivy/src/main/scala/sbt/internal/librarymanagement/IvyScalaUtil.scala +++ b/ivy/src/main/scala/sbt/internal/librarymanagement/IvyScalaUtil.scala @@ -133,7 +133,7 @@ object IvyScalaUtil { log: Logger ): Unit = { val scalaVersionConfigs: String => Boolean = - if (scalaVersionConfigs0.isEmpty) (c: String) => false else scalaVersionConfigs0.toSet + if (scalaVersionConfigs0.isEmpty) (_: String) => false else scalaVersionConfigs0.toSet def binaryScalaWarning(dep: DependencyDescriptor): Option[String] = { val id = dep.getDependencyRevisionId val depBinaryVersion = CrossVersion.binaryScalaVersion(id.getRevision) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 73b38a1df..21ade5fc5 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,10 +4,10 @@ import sbt.contraband.ContrabandPlugin.autoImport._ object Dependencies { val scala211 = "2.11.12" - val scala212 = "2.12.6" + val scala212 = "2.12.7" - private val ioVersion = "1.2.0-M2" - private val utilVersion = "1.2.0-M1" + private val ioVersion = "1.2.1" + private val utilVersion = "1.2.2" private val sbtIO = "org.scala-sbt" %% "io" % ioVersion