Merge pull request #5571 from SethTisue/mima-upgrade

upgrade MiMa to 0.1.12

4 files changed, 263 insertions, 2 deletions

diff --git a/bincompat-backward.whitelist.conf b/bincompat-backward.whitelist.conf
index 0770b3cb95..9aee0ea98a 100644
--- a/bincompat-backward.whitelist.conf
+++ b/bincompat-backward.whitelist.conf
@@ -223,6 +223,30 @@ filter {
     {
         matchName="scala.concurrent.impl.Promise.toString"
         problemName=MissingMethodProblem
+    },
+    // these next four can be removed once there is a fix for
+    // https://github.com/typesafehub/migration-manager/issues/147
+    {
+        matchName="scala.collection.Iterator#Leading#1.advance"
+        problemName=DirectMissingMethodProblem
+    },
+    {
+        matchName="scala.collection.Iterator#Leading#1.finish"
+        problemName=IncompatibleResultTypeProblem
+    },
+    {
+        matchName="scala.collection.Iterator#Leading#1.lookahead"
+        problemName=DirectMissingMethodProblem
+    },
+    {
+        matchName="scala.collection.Iterator#Leading#1.this"
+        problemName=DirectMissingMethodProblem
+    },
+    // ditto on
+    // https://github.com/typesafehub/migration-manager/issues/147
+    {
+        matchName="scala.reflect.io.ManifestResources$FileEntry$3"
+        problemName=MissingClassProblem
     }
   ]
 }
diff --git a/bincompat-forward.whitelist.conf b/bincompat-forward.whitelist.conf
index 411989fd4b..7f28a718bd 100644
--- a/bincompat-forward.whitelist.conf
+++ b/bincompat-forward.whitelist.conf
@@ -391,6 +391,243 @@ filter {
     {
         matchName="scala.reflect.runtime.Settings.YpartialUnification"
         problemName=MissingMethodProblem
+    },
+    // serialVersionUID (because of 4e546eb08c191fb7b9ccfd06f9a749bd1326cd64)
+    {
+        matchName="scala.None.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.Enumeration#Value.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.Enumeration#Val.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.Option.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.Some.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.Enumeration.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.reflect.AnyValManifest.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.IndexedSeqLike#Elements.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.Iterator#Leading#1.finish"
+        problemName=IncompatibleResultTypeProblem
+    },
+    {
+        matchName="scala.collection.Iterator#Leading#1.trailer"
+        problemName=DirectMissingMethodProblem
+    },
+    {
+        matchName="scala.collection.Iterator#Leading#1.this"
+        problemName=DirectMissingMethodProblem
+    },
+    {
+        matchName="scala.collection.immutable.Set#Set3.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.Stack.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.BitSet.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.Set#Set4.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.Nil.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.HashSet.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.HashMap.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.List.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.TreeSet.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.ListSerializeEnd.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.HashSet#SerializationProxy.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.Queue.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.Range.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.ListMap.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.List#SerializationProxy.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.Set#Set2.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.Stream#Cons.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.ListMap#Node.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.::.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.HashMap#SerializationProxy.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.immutable.Set#Set1.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.convert.Wrappers.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.parallel.immutable.ParHashSet.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.parallel.immutable.ParHashMap.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.parallel.immutable.ParRange.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.parallel.mutable.ParArray.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.parallel.mutable.ParHashMap.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.parallel.mutable.ParHashSet.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.concurrent.TrieMapSerializationEnd.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.concurrent.TrieMap.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.mutable.ArrayBuffer.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.mutable.ListBuffer.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.mutable.LinkedHashSet.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.mutable.HashSet.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.mutable.BitSet.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.mutable.UnrolledBuffer.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.mutable.StringBuilder.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.mutable.History.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.mutable.HashMap.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.mutable.LinkedHashMap.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.mutable.MutableList.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.mutable.ArraySeq.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.mutable.DoubleLinkedList.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.mutable.LinkedList.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.collection.mutable.ArrayStack.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.util.matching.Regex.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.reflect.api.SerializedExpr.serialVersionUID"
+        problemName=MissingFieldProblem
+    },
+    {
+        matchName="scala.reflect.api.SerializedTypeTag.serialVersionUID"
+        problemName=MissingFieldProblem
     }
   ]
 }
diff --git a/build.xml b/build.xml
index e0b2f353e1..a5d0dae0d6 100644
--- a/build.xml
+++ b/build.xml
@@ -1656,7 +1656,7 @@ TODO:
     <mkdir dir="${bc-build.dir}"/>
     <!-- Pull down MIMA -->
     <artifact:dependencies pathId="mima.classpath">
-      <dependency groupId="com.typesafe" artifactId="mima-reporter_2.10" version="0.1.8"/>
+      <dependency groupId="com.typesafe" artifactId="mima-reporter_2.10" version="0.1.12"/>
     </artifact:dependencies>
     <artifact:dependencies pathId="old.bc.classpath">
       <dependency groupId="org.scala-lang" artifactId="scala-library" version="${bc-reference-version}"/>
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 4c0a6e7b8a..f1201d58c2 100644
--- 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.8"
+libraryDependencies += "com.typesafe" %% "mima-reporter" % "0.1.12"