8000 Merge branch '2.12.x' into merge-212 · scala/scala@6c10402 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6c10402

Browse files
lrytzlrytz
committed
Merge branch '2.12.x' into merge-212
2 parents 229f499 + 42d8ae9 commit 6c10402

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

‎project/MimaFilters.scala

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@ object MimaFilters extends AutoPlugin {
6868
ProblemFilters.exclude[MissingClassProblem]("scala.collection.IndexedSeqSlidingIterator"),
6969
ProblemFilters.exclude[NewMixinForwarderProblem]("scala.collection.IndexedSeqOps.sliding"),
7070
ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.collection.mutable.ArrayDequeOps.scala$collection$mutable$ArrayDequeOps$$super$sliding"),
71+
72+
// new jdk 25 method in CharSequence => mixin forwarders
73+
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.Predef#ArrayCharSequence.getChars"),
74+
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.Predef#SeqCharSequence.getChars"),
75+
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.mutable.StringBuilder.getChars"),
76+
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.ArrayCharSequence.getChars"),
77+
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.SeqCharSequence.getChars"),
7178
)
7279

7380
override val buildSettings = Seq(

0 commit comments

Comments
 (0)
0