Merge pull request #195 from dwijnand/compat

Switch to sbt-compat
lightbend-labs · Aug 22, 2017 · 8724e4f · 8724e4f
2 parents 80bef91 + 83db868
commit 8724e4f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 78 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -167,13 +167,37 @@ object MimaBuild {
     settings(scriptedSettings)
     settings(name := "sbt-mima-plugin",
              sbtPlugin := true,
+             libraryDependencies += Defaults.sbtPluginExtra(
+               "com.dwijnand" % "sbt-compat" % "1.0.0",
+               (sbtBinaryVersion in pluginCrossBuild).value,
+               (scalaBinaryVersion in update).value
+             ),
              scriptedLaunchOpts := scriptedLaunchOpts.value :+ "-Dplugin.version=" + version.value,
              scriptedBufferLog := false,
              // Scripted locally publishes sbt plugin and then runs test projects with locally published version.
              // Therefore we also need to locally publish dependent projects on scripted test run.
              scripted := (scripted dependsOn (publishLocal in core, publishLocal in reporter)).evaluated)
     dependsOn(reporter)
-    settings(sbtPublishSettings:_*)
+    settings(
+      sbtPublishSettings,
+      mimaBinaryIssueFilters ++= {
+        import com.typesafe.tools.mima.core._
+        Seq(
+          // sbt-compat has been created to define these and has been added as a dependency of sbt-mima-plugin
+          ProblemFilters.exclude[MissingClassProblem]("sbt.compat"),
+          ProblemFilters.exclude[MissingClassProblem]("sbt.compat$"),
+          ProblemFilters.exclude[MissingClassProblem]("sbt.librarymanagement.package"),
+          ProblemFilters.exclude[MissingClassProblem]("sbt.librarymanagement.package$"),
+          ProblemFilters.exclude[MissingClassProblem]("sbt.librarymanagement.package$UpdateConfigurationOps"),
+          ProblemFilters.exclude[MissingClassProblem]("sbt.librarymanagement.package$UpdateConfigurationOps$"),
+          ProblemFilters.exclude[MissingClassProblem]("sbt.librarymanagement.UpdateConfiguration"),
+          ProblemFilters.exclude[MissingClassProblem]("sbt.librarymanagement.UpdateConfiguration$"),
+          ProblemFilters.exclude[MissingClassProblem]("sbt.librarymanagement.DependencyResolution"),
+          ProblemFilters.exclude[MissingClassProblem]("sbt.librarymanagement.ivy.IvyDependencyResolution"),
+          ProblemFilters.exclude[MissingClassProblem]("sbt.librarymanagement.ivy.IvyDependencyResolution$")
+        )
+      }
+    )
   )
 
   lazy val reporterFunctionalTests = project("reporter-functional-tests",

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -17,4 +17,4 @@ libraryDependencies += "com.typesafe" % "config" % "1.3.0"
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")
 
-addSbtPlugin("com.typesafe"  % "sbt-mima-plugin" % "0.1.15")
+addSbtPlugin("com.typesafe"  % "sbt-mima-plugin" % "0.1.17")
diff --git a/sbtplugin/src/main/scala-sbt-0.13/compat.scala b/sbtplugin/src/main/scala-sbt-0.13/compat.scala
diff --git a/sbtplugin/src/main/scala-sbt-1.0/compat.scala b/sbtplugin/src/main/scala-sbt-1.0/compat.scala