summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartynas Mickevičius <martynas@2m.lt>2016-12-08 21:51:59 +0800
committerMartynas Mickevičius <martynas@2m.lt>2016-12-08 21:51:59 +0800
commit695049d72f3c2966dafa409fa0d322c898014d2f (patch)
tree925cb00335dc1b221c86feb6d48c0905b4dd2c62
parent264cc5f20cd9a6b9c6d414dfea696de1b8608dc5 (diff)
downloadscala-695049d72f3c2966dafa409fa0d322c898014d2f.tar.gz
scala-695049d72f3c2966dafa409fa0d322c898014d2f.tar.bz2
scala-695049d72f3c2966dafa409fa0d322c898014d2f.zip
Upgrade MiMa to 0.1.13
-rw-r--r--bincompat-backward.whitelist.conf24
-rw-r--r--build.xml2
-rw-r--r--project/plugins.sbt2
3 files changed, 2 insertions, 26 deletions
diff --git a/bincompat-backward.whitelist.conf b/bincompat-backward.whitelist.conf
index 9aee0ea98a..0770b3cb95 100644
--- a/bincompat-backward.whitelist.conf
+++ b/bincompat-backward.whitelist.conf
@@ -223,30 +223,6 @@ 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/build.xml b/build.xml
index a5d0dae0d6..cfdff3f1e3 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.12"/>
+ <dependency groupId="com.typesafe" artifactId="mima-reporter_2.10" version="0.1.13"/>
</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 f1201d58c2..6001b6f2b4 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.12"
+libraryDependencies += "com.typesafe" %% "mima-reporter" % "0.1.13"