Merge pull request #198 from nick-nachos/wip-196-newInheritedMethodMa…

…tchingFix Match inherited abstract methods against inheriting class #196
lightbend-labs · Oct 9, 2017 · 9d5899e · 9d5899e
2 parents 8724e4f + 886afbd
commit 9d5899e
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 1 deletion.
diff --git a/core/src/main/scala/com/typesafe/tools/mima/core/Problems.scala b/core/src/main/scala/com/typesafe/tools/mima/core/Problems.scala
@@ -106,7 +106,8 @@ case class IncompatibleResultTypeProblem(oldmeth: MemberInfo, newmeth: MemberInf
 // into two, in case the affected version is the other one, rather than the current one. (reversed if forward check).
 abstract class AbstractMethodProblem(newmeth: MemberInfo) extends MemberProblem(newmeth)
 
-case class InheritedNewAbstractMethodProblem(clazz: ClassInfo, inheritedMethod: MemberInfo) extends AbstractMethodProblem(inheritedMethod) {
+case class InheritedNewAbstractMethodProblem(clazz: ClassInfo, inheritedMethod: MemberInfo)
+    extends AbstractMethodProblem(new MemberInfo(clazz, inheritedMethod.bytecodeName, inheritedMethod.flags, inheritedMethod.sig)) {
   def description = affectedVersion => "abstract " + inheritedMethod.methodString+ " is inherited by class " + clazz.bytecodeName + " in " + affectedVersion + " version."
 }
 

diff --git a/sbtplugin/src/sbt-test/sbt-mima-plugin/backward-new-inherited-method/build.sbt b/sbtplugin/src/sbt-test/sbt-mima-plugin/backward-new-inherited-method/build.sbt
@@ -0,0 +1,6 @@
+import com.typesafe.tools.mima.core._
+
+mimaPreviousArtifacts := Set(organization.value %% name.value % "0.0.1-SNAPSHOT")
+mimaBinaryIssueFilters := Seq(
+  ProblemFilters.exclude[InheritedNewAbstractMethodProblem]("A.bar")
+)
diff --git a/sbtplugin/src/sbt-test/sbt-mima-plugin/backward-new-inherited-method/project/plugins.sbt b/sbtplugin/src/sbt-test/sbt-mima-plugin/backward-new-inherited-method/project/plugins.sbt
@@ -0,0 +1 @@
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % System.getProperty("plugin.version"))
diff --git a/...ugin/src/sbt-test/sbt-mima-plugin/backward-new-inherited-method/src/main/scala/v1/A.scala b/...ugin/src/sbt-test/sbt-mima-plugin/backward-new-inherited-method/src/main/scala/v1/A.scala
@@ -0,0 +1,3 @@
+abstract class A {
+  def foo = 1
+}
diff --git a/...ugin/src/sbt-test/sbt-mima-plugin/backward-new-inherited-method/src/main/scala/v2/A.scala b/...ugin/src/sbt-test/sbt-mima-plugin/backward-new-inherited-method/src/main/scala/v2/A.scala
@@ -0,0 +1,7 @@
+trait T {
+  def bar
+}
+
+abstract class A extends T {
+  def foo = 1
+}
diff --git a/sbtplugin/src/sbt-test/sbt-mima-plugin/backward-new-inherited-method/test b/sbtplugin/src/sbt-test/sbt-mima-plugin/backward-new-inherited-method/test
@@ -0,0 +1,13 @@
+> set scalaSource in Compile := baseDirectory.value /"src" /"main" /"scala" /"v1"
+> set version := s"0.0.1-SNAPSHOT"
+> publishLocal
+
+> set scalaSource in Compile := baseDirectory.value /"src" /"main" /"scala" /"v2"
+> set version := s"0.0.2-SNAPSHOT"
+
+# filters are set in the build file, so mima check should pass
+> mimaReportBinaryIssues
+
+# remove all filters so mima check fails
+> set mimaBinaryIssueFilters := Seq.empty
+-> mimaReportBinaryIssues
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % System.getProperty("plugin.version"))