summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Zeiger <szeiger@novocode.com>2016-11-21 17:58:15 +0100
committerGitHub <noreply@github.com>2016-11-21 17:58:15 +0100
commit8cdd46fb86f5e516c2550a665fe592f8e6b816fd (patch)
tree6f1b2a368c4411d339e62dbb5df138a0eca81f01
parent40f8df19ced57637a795c705080e528d82303248 (diff)
parent3107532f459d4a66ecd302f0b39b14bd7cf2d248 (diff)
downloadscala-8cdd46fb86f5e516c2550a665fe592f8e6b816fd.tar.gz
scala-8cdd46fb86f5e516c2550a665fe592f8e6b816fd.tar.bz2
scala-8cdd46fb86f5e516c2550a665fe592f8e6b816fd.zip
Merge pull request #5549 from szeiger/wip/whitelist-mima
Whitelist the remaining changes since 2.12.0 that break all builds
-rw-r--r--bincompat-backward.whitelist.conf5
-rw-r--r--bincompat-forward.whitelist.conf8
2 files changed, 12 insertions, 1 deletions
diff --git a/bincompat-backward.whitelist.conf b/bincompat-backward.whitelist.conf
index bb94f4be6c..af80bedf5b 100644
--- a/bincompat-backward.whitelist.conf
+++ b/bincompat-backward.whitelist.conf
@@ -12,7 +12,10 @@ filter {
{
matchName="scala.reflect.runtime.SymbolLoaders#TopClassCompleter.this"
problemName=IncompatibleMethTypeProblem
+ },
+ {
+ matchName="scala.sys.process.ProcessImpl#CompoundProcess.getExitValue"
+ problemName=DirectMissingMethodProblem
}
-
]
}
diff --git a/bincompat-forward.whitelist.conf b/bincompat-forward.whitelist.conf
index 705fa031ab..541268e50e 100644
--- a/bincompat-forward.whitelist.conf
+++ b/bincompat-forward.whitelist.conf
@@ -12,6 +12,14 @@ filter {
{
matchName="scala.reflect.runtime.SymbolLoaders#TopClassCompleter.this"
problemName=IncompatibleMethTypeProblem
+ },
+ {
+ matchName="scala.sys.process.ProcessImpl#CompoundProcess.futureValue"
+ problemName=DirectMissingMethodProblem
+ },
+ {
+ matchName="scala.sys.process.ProcessImpl#CompoundProcess.futureThread"
+ problemName=DirectMissingMethodProblem
}
]
}