mirror of https://github.com/sbt/sbt.git
Merge branch '1.0.0' into wip/api_mod
This commit is contained in:
commit
a43947410e
10
build.sbt
10
build.sbt
|
|
@ -106,8 +106,14 @@ lazy val lmCore = (project in file("core"))
|
|||
ProblemFilters.exclude[ReversedMissingMethodProblem]("sbt.librarymanagement.ModuleDescriptor.moduleSettings"),
|
||||
// New methods added to LM API
|
||||
ProblemFilters.exclude[ReversedMissingMethodProblem]("sbt.librarymanagement.ModuleDescriptor.extraInputHash"),
|
||||
// New formats for Logger and GlockLock
|
||||
ProblemFilters.exclude[ReversedMissingMethodProblem]("sbt.internal.librarymanagement.formats.*"),
|
||||
// method globalLockIsoString()sjsonnew.IsoString in trait sbt.internal.librarymanagement.formats.GlobalLockFormat is present only in current version
|
||||
// method xsbtiLoggerIsoString()sjsonnew.IsoString in trait sbt.internal.librarymanagement.formats.LoggerFormat is present only in current version
|
||||
// These only fail in Scala 2.11
|
||||
// We're _probably_ ok to add these between sbt 1 RC2 and RC3,
|
||||
// but it's dangerous territory in general
|
||||
// see typesafehub/migration-manager#183 for an example of what happens..
|
||||
ProblemFilters.exclude[ReversedMissingMethodProblem]("sbt.internal.librarymanagement.formats.GlobalLockFormat.globalLockIsoString"),
|
||||
ProblemFilters.exclude[ReversedMissingMethodProblem]("sbt.internal.librarymanagement.formats.LoggerFormat.xsbtiLoggerIsoString"),
|
||||
)
|
||||
)
|
||||
.configure(addSbtIO, addSbtUtilLogging, addSbtUtilPosition, addSbtUtilCache)
|
||||
|
|
|
|||
Loading…
Reference in New Issue