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

Merge pull request #3395 from dwijnand/mima 

Bump mimaPreviousArtifacts to 1.0.0-RC3
This commit is contained in:
Dale Wijnand 2017-07-31 14:45:21 +01:00 committed by GitHub
parent 1d3d29cdab deae720bf1
commit 2f9029c623
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build.sbt
View File

@ -1,7 +1,6 @@
import Util._ import Util._
import Dependencies._ import Dependencies._
import Sxr.sxr import Sxr.sxr
import com.typesafe.tools.mima.core._, ProblemFilters._
// ThisBuild settings take lower precedence, // ThisBuild settings take lower precedence,
// but can be shared across the multi projects. // but can be shared across the multi projects.
@ -67,7 +66,7 @@ def testedBaseSettings: Seq[Setting[_]] =
baseSettings ++ testDependencies baseSettings ++ testDependencies
val mimaSettings = Def settings ( val mimaSettings = Def settings (
mimaPreviousArtifacts := Set(organization.value % moduleName.value % "1.0.0-RC2" mimaPreviousArtifacts := Set(organization.value % moduleName.value % "1.0.0-RC3"
cross (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled) cross (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled)
) )
) )
@ -361,21 +360,6 @@ lazy val mainProj = (project in file("main"))
baseDirectory.value / "src" / "main" / "contraband-scala", baseDirectory.value / "src" / "main" / "contraband-scala",
sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala", sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
mimaSettings, mimaSettings,
mimaBinaryIssueFilters ++= Seq(
// abstract method terminalHeight()Int in class sbt.InteractionService is present only in current version
// Manually checked that sbt.InteractionService isn't implemented by anything outside of sbt
ProblemFilters.exclude[ReversedMissingMethodProblem]("sbt.InteractionService.terminalHeight"),
// abstract method terminalWidth()Int in class sbt.InteractionService is present only in current version
// Manually checked that sbt.InteractionService isn't implemented by anything outside of sbt
ProblemFilters.exclude[ReversedMissingMethodProblem]("sbt.InteractionService.terminalWidth"),
// method scalaVersionFromSbtBinaryVersion(java.lang.String)java.lang.String in object sbt.Defaults does not have a correspondent in current version
// Was private[sbt]
ProblemFilters.exclude[DirectMissingMethodProblem]("sbt.Defaults.scalaVersionFromSbtBinaryVersion"),
// AltLibraryManagementCodec was removed.
ProblemFilters.exclude[MissingClassProblem]("sbt.internal.AltLibraryManagementCodec*"),
// The signature of internal method changed. This is ok.
ProblemFilters.exclude[IncompatibleMethTypeProblem]("sbt.internal.LibraryManagement.cachedUpdate"),
)
) )
.configure( .configure(
addSbtIO, addSbtIO,
@ -397,11 +381,6 @@ lazy val sbtProj = (project in file("sbt"))
crossScalaVersions := Seq(baseScalaVersion), crossScalaVersions := Seq(baseScalaVersion),
crossPaths := false, crossPaths := false,
mimaSettings, mimaSettings,
mimaBinaryIssueFilters ++= Seq(
// abstract [synthetic] method [...] in interface sbt.Import is present only in current version
// This is a forward-compatibility concern, which we don't guarantee.
ProblemFilters.exclude[ReversedMissingMethodProblem]("sbt.Import.*"),
)
) )
.configure(addSbtCompilerBridge) .configure(addSbtCompilerBridge)