luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4239 from eed3si9n/wip/lm 

LM 1.2.0-M3
This commit is contained in:
eugene yokota 2018-07-01 04:02:20 -04:00 committed by GitHub
parent 0dfab79d8d 1aea46d9e4
commit 14b320fe21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.sbt
View File

@ -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"),
)

2
project/Dependencies.scala
View File

@ -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

2
sbt/src/main/scala/Import.scala
View File

@ -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