From c0030d594c4f0abdd70e8cf66fb03a2b326905f6 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 1 Jul 2018 03:02:50 -0400 Subject: [PATCH 1/2] LM 1.2.0-M3 Fixes https://github.com/sbt/sbt/issues/3773 Ref https://github.com/sbt/librarymanagement/pull/211 Ref https://github.com/sbt/librarymanagement/pull/253 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 4da547a9d..af34a5aaa 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,7 +10,7 @@ object Dependencies { // sbt modules private val ioVersion = "1.2.0-M2" private val utilVersion = "1.2.0-M2" - private val lmVersion = "1.2.0-M2" + private val lmVersion = "1.2.0-M3" private val zincVersion = "1.2.0-M1" private val sbtIO = "org.scala-sbt" %% "io" % ioVersion From 1aea46d9e4a051639fd391dc3f533ebea04295df Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 1 Jul 2018 03:13:09 -0400 Subject: [PATCH 2/2] Import SemanticSelector --- build.sbt | 3 +++ sbt/src/main/scala/Import.scala | 2 ++ 2 files changed, 5 insertions(+) diff --git a/build.sbt b/build.sbt index 0179b2d3b..b9bd3f797 100644 --- a/build.sbt +++ b/build.sbt @@ -597,6 +597,9 @@ lazy val sbtIgnoredProblems = { exclude[DirectMissingMethodProblem]("sbt.Import.Param"), exclude[DirectMissingMethodProblem]("sbt.package.Param"), + exclude[ReversedMissingMethodProblem]("sbt.Import.SemanticSelector"), + exclude[ReversedMissingMethodProblem]("sbt.Import.sbt$Import$_setter_$SemanticSelector_="), + // Dropped in favour of plain scala.Function, and its compose method exclude[DirectMissingMethodProblem]("sbt.package.toFn1"), ) diff --git a/sbt/src/main/scala/Import.scala b/sbt/src/main/scala/Import.scala index 170a39e4a..109f54d48 100644 --- a/sbt/src/main/scala/Import.scala +++ b/sbt/src/main/scala/Import.scala @@ -317,6 +317,8 @@ trait Import { type ScalaVersion = sbt.librarymanagement.ScalaVersion val ScmInfo = sbt.librarymanagement.ScmInfo type ScmInfo = sbt.librarymanagement.ScmInfo + val SemanticSelector = sbt.librarymanagement.SemanticSelector + type SemanticSelector = sbt.librarymanagement.SemanticSelector val SftpRepository = sbt.librarymanagement.SftpRepository type SftpRepository = sbt.librarymanagement.SftpRepository type SshBasedRepository = sbt.librarymanagement.SshBasedRepository