Merge pull request scala#5572 from SethTisue/merge-2.11.x-to-2.12.x-d…

…ec-1 merging 2.11.x onto 2.12.x [ci: last-only]
dyuval · Dec 1, 2016 · aacef6d · aacef6d
2 parents c2eb299 + 212c525
commit aacef6d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/bincompat-backward.whitelist.conf b/bincompat-backward.whitelist.conf
@@ -16,6 +16,32 @@ filter {
     {
       matchName="scala.sys.process.ProcessImpl#CompoundProcess.getExitValue"
       problemName=DirectMissingMethodProblem
+    },
+    # these next seven can be removed once there is a fix for
+    # https://github.com/typesafehub/migration-manager/issues/147
+    {
+        matchName="scala.collection.Iterator#Leading#1.hd_="
+        problemName=DirectMissingMethodProblem
+    },
+    {
+        matchName="scala.collection.Iterator#Leading#1.hd"
+        problemName=DirectMissingMethodProblem
+    },
+    {
+        matchName="scala.collection.Iterator#Leading#1.status_="
+        problemName=DirectMissingMethodProblem
+    },
+    {
+        matchName="scala.collection.Iterator#Leading#1.lookahead_="
+        problemName=DirectMissingMethodProblem
+    },
+    {
+        matchName="scala.collection.Iterator#Leading#1.status"
+        problemName=DirectMissingMethodProblem
+    },
+    {
+        matchName="scala.collection.Iterator#Leading#1.lookahead"
+        problemName=DirectMissingMethodProblem
     }
   ]
 }
diff --git a/bincompat-forward.whitelist.conf b/bincompat-forward.whitelist.conf
@@ -24,6 +24,12 @@ filter {
     {
       matchName="scala.reflect.runtime.Settings.Yvirtpatmat"
       problemName=DirectMissingMethodProblem
+    },
+    # this one can be removed once there is a fix for
+    # https://github.com/typesafehub/migration-manager/issues/147
+    {
+        matchName="scala.collection.Iterator#Leading#1.trailer"
+        problemName=DirectMissingMethodProblem
     }
   ]
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -19,4 +19,4 @@ buildInfoKeys := Seq[BuildInfoKey](buildClasspath)
 
 buildInfoPackage := "scalabuild"
 
-libraryDependencies += "com.typesafe" %% "mima-reporter" % "0.1.11"
+libraryDependencies += "com.typesafe" %% "mima-reporter" % "0.1.12"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,4 @@ buildInfoKeys := Seq[BuildInfoKey](buildClasspath)

		buildInfoPackage := "scalabuild"

		libraryDependencies += "com.typesafe" %% "mima-reporter" % "0.1.11"
		libraryDependencies += "com.typesafe" %% "mima-reporter" % "0.1.12"