diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2016-12-01 15:40:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-01 15:40:40 -0800 |
| commit | aacef6d66e14096e36f849945800c092d4688f2a (patch) | |
| tree | 69eeaacc188a238e8dd95ccddcbd81e86d092081 | |
| parent | c2eb299b0e1ed2f321a81d4afbdb36762e2c0e7b (diff) | |
| parent | 212c525fc185f0d445d96f8f3c07f6edd0f3dba6 (diff) | |
| download | scala-aacef6d66e14096e36f849945800c092d4688f2a.tar.gz scala-aacef6d66e14096e36f849945800c092d4688f2a.tar.bz2 scala-aacef6d66e14096e36f849945800c092d4688f2a.zip | |
Merge pull request #5572 from SethTisue/merge-2.11.x-to-2.12.x-dec-1
merging 2.11.x onto 2.12.x [ci: last-only]
| -rw-r--r-- | bincompat-backward.whitelist.conf | 26 | ||||
| -rw-r--r-- | bincompat-forward.whitelist.conf | 6 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
3 files changed, 33 insertions, 1 deletions
diff --git a/bincompat-backward.whitelist.conf b/bincompat-backward.whitelist.conf index af80bedf5b..6e260872c9 100644 --- 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 index aebd2c8d1b..4461974081 100644 --- 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 index e056de55ec..d2476d9207 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.11" +libraryDependencies += "com.typesafe" %% "mima-reporter" % "0.1.12" |