Skip to content

Commit 30b9b8e

Browse files
committed
fix CI issues, add mima filters
1 parent 0585508 commit 30b9b8e

File tree

2 files changed

+34
-1
lines changed

2 files changed

+34
-1
lines changed

.gitmodules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
[submodule "community-build/community-projects/scala-parallel-collections"]
101101
path = community-build/community-projects/scala-parallel-collections
102102
url = https://github.com/dotty-staging/scala-parallel-collections.git
103+
branch = serialisation-stability-fix
103104
[submodule "community-build/community-projects/scala-collection-compat"]
104105
path = community-build/community-projects/scala-collection-compat
105106
url = https://github.com/dotty-staging/scala-collection-compat.git

project/Scala2LibraryBootstrappedMiMaFilters.scala

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,39 @@ object Scala2LibraryBootstrappedMiMaFilters {
193193
"scala.util.matching.Regex.Groups", "scala.util.matching.Regex.Match",
194194
"scala.util.package.chaining",
195195
"scala.util.Using.Manager", "scala.util.Using.Releasable", "scala.util.Using#Releasable.AutoCloseableIsReleasable",
196-
).map(ProblemFilters.exclude[MissingFieldProblem])
196+
).map(ProblemFilters.exclude[MissingFieldProblem]) ++ Seq(
197+
// DirectMissingMethodProblem by flags being changed from ACC_PUBLIC, ACC_BRIDGE, ACC_SYNTHETIC to ACC_PUBLIC in mixin forwarders:
198+
// * from java.util.Comparator:
199+
Seq("reversed", "thenComparing", "thenComparingInt", "thenComparingLong", "thenComparingInt", "thenComparingDouble").flatMap { method =>
200+
Seq(
201+
ProblemFilters.exclude[DirectMissingMethodProblem](s"scala.Enumeration#ValueOrdering.$method"),
202+
ProblemFilters.exclude[DirectMissingMethodProblem](s"scala.concurrent.duration.Deadline#DeadlineIsOrdered.$method"),
203+
ProblemFilters.exclude[DirectMissingMethodProblem](s"scala.concurrent.duration.Duration#DurationIsOrdered.$method"),
204+
ProblemFilters.exclude[DirectMissingMethodProblem](s"scala.concurrent.duration.FiniteDuration#FiniteDurationIsOrdered.$method"),
205+
ProblemFilters.exclude[DirectMissingMethodProblem](s"scala.math.Numeric#*.$method"),
206+
ProblemFilters.exclude[DirectMissingMethodProblem](s"scala.math.Ordering#*.$method"),
207+
)
208+
},
209+
// * from java.util.Spliterator:
210+
Seq("getExactSizeIfKnown", "hasCharacteristics", "getComparator").flatMap { method =>
211+
Seq(
212+
ProblemFilters.exclude[DirectMissingMethodProblem](s"scala.collection.DoubleStepper#DoubleStepperSpliterator.$method"),
213+
ProblemFilters.exclude[DirectMissingMethodProblem](s"scala.collection.IntStepper#IntStepperSpliterator.$method"),
214+
ProblemFilters.exclude[DirectMissingMethodProblem](s"scala.collection.LongStepper#LongStepperSpliterator.$method"),
215+
)
216+
},
217+
// * from java.util.Enumeration:
218+
Seq(
219+
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.convert.JavaCollectionWrappers#IteratorWrapper.asIterator"),
220+
),
221+
// FinalMethodProblem - seems to be a bug in MiMa, as neither new or old version do not have final modifier.
222+
// What did change is that sizeHint, and requireBounds had `final` added, but that does not get reported.
223+
Seq(
224+
ProblemFilters.exclude[FinalMethodProblem]("scala.**.sizeHint$default$2"),
225+
ProblemFilters.exclude[FinalMethodProblem]("scala.collection.mutable.ArrayDeque.requireBounds$default$2")
226+
)
227+
).flatten
228+
197229
}
198230
)
199231
}

0 commit comments

Comments
 (0)