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

Merge branch '1.0.0' into wip/api_mod

This commit is contained in:
eugene yokota 2017-07-28 02:27:29 -04:00 committed by GitHub
parent f976c6824b a80ce86e65
commit a43947410e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.sbt
View File

@ -106,8 +106,14 @@ lazy val lmCore = (project in file("core"))
ProblemFilters.exclude[ReversedMissingMethodProblem]("sbt.librarymanagement.ModuleDescriptor.moduleSettings"), ProblemFilters.exclude[ReversedMissingMethodProblem]("sbt.librarymanagement.ModuleDescriptor.moduleSettings"),
// New methods added to LM API // New methods added to LM API
ProblemFilters.exclude[ReversedMissingMethodProblem]("sbt.librarymanagement.ModuleDescriptor.extraInputHash"), ProblemFilters.exclude[ReversedMissingMethodProblem]("sbt.librarymanagement.ModuleDescriptor.extraInputHash"),
// New formats for Logger and GlockLock // method globalLockIsoString()sjsonnew.IsoString in trait sbt.internal.librarymanagement.formats.GlobalLockFormat is present only in current version
ProblemFilters.exclude[ReversedMissingMethodProblem]("sbt.internal.librarymanagement.formats.*"), // 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) .configure(addSbtIO, addSbtUtilLogging, addSbtUtilPosition, addSbtUtilCache)