summaryrefslogtreecommitdiff
path: root/bincompat-forward.whitelist.conf
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2013-05-11 14:30:08 +0200
committerPhilipp Haller <hallerp@gmail.com>2013-05-11 15:21:53 +0200
commit77437ffa521a6d1b073283624a722848a8c0b33c (patch)
tree5e659fc73506595a894f364041685420abdc24b5 /bincompat-forward.whitelist.conf
parent082ca2ea97dd925d688ad6ec813f9bbfae12598f (diff)
downloadscala-77437ffa521a6d1b073283624a722848a8c0b33c.tar.gz
scala-77437ffa521a6d1b073283624a722848a8c0b33c.tar.bz2
scala-77437ffa521a6d1b073283624a722848a8c0b33c.zip
SI-7442 Update bundled Fork/Join pool (JSR166y)
- Updates ForkJoinPool and dependent classes to the latest jsr166y revisions: ForkJoinPool.java: Revision 1.185 Sat Feb 16 20:50:29 2013 UTC (2 months, 2 weeks ago) by jsr166 ForkJoinTask.java: Revision 1.100 Tue Feb 5 17:09:54 2013 UTC (3 months ago) by jsr166 ForkJoinWorkerThread.java: Revision 1.73 Wed Nov 21 19:54:39 2012 UTC (5 months, 2 weeks ago) by dl - Includes Akka-contributed `sun.misc.Unsafe` detection to support Android. See changeset 06d685c1bbd8a0d058ee8a3f374569f8097f2acc - Adds private `CountedCompleter` class. This class is only visible and used in `ForkJoinPool.java`. - Updates desired.sha1 for updated forkjoin.jar. - Updates binary compatibility whitelists to exclude package-private methods in the `forkjoin` package. - Also fixes SI-7438.
Diffstat (limited to 'bincompat-forward.whitelist.conf')
-rw-r--r--bincompat-forward.whitelist.conf37
1 files changed, 37 insertions, 0 deletions
diff --git a/bincompat-forward.whitelist.conf b/bincompat-forward.whitelist.conf
index 88eabd4f8c..fd6451d3bc 100644
--- a/bincompat-forward.whitelist.conf
+++ b/bincompat-forward.whitelist.conf
@@ -430,6 +430,43 @@ filter {
{
matchName="scala.reflect.internal.ModifierFlags.DEFAULTMETHOD"
problemName=MissingMethodProblem
+ },
+ # scala.concurrent.forkjoin (SI-7442)
+ {
+ matchName="scala.concurrent.forkjoin.ForkJoinPool.registerWorker"
+ problemName=IncompatibleMethTypeProblem
+ },
+ {
+ matchName="scala.concurrent.forkjoin.ForkJoinPool.externalPush"
+ problemName=MissingMethodProblem
+ },
+ {
+ matchName="scala.concurrent.forkjoin.ForkJoinPool.this"
+ problemName=IncompatibleMethTypeProblem
+ },
+ {
+ matchName="scala.concurrent.forkjoin.ForkJoinPool.signalWork"
+ problemName=MissingMethodProblem
+ },
+ {
+ matchName="scala.concurrent.forkjoin.ForkJoinPool.awaitQuiescence"
+ problemName=MissingMethodProblem
+ },
+ {
+ matchName="scala.concurrent.forkjoin.ForkJoinPool.tryCompensate"
+ problemName=MissingMethodProblem
+ },
+ {
+ matchName="scala.concurrent.forkjoin.ForkJoinTask.recordExceptionalCompletion"
+ problemName=MissingMethodProblem
+ },
+ {
+ matchName="scala.concurrent.forkjoin.ForkJoinTask.internalPropagateException"
+ problemName=MissingMethodProblem
+ },
+ {
+ matchName="scala.concurrent.forkjoin.ForkJoinPool.helpJoinOnce"
+ problemName=IncompatibleResultTypeProblem
}
]
}