Skip to content

Commit 9b0e761

Browse files
committed
chore: stdlib will copy scala.util.Sorting from Scala 2
1 parent b54b19b commit 9b0e761

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

project/Scala2LibraryBootstrappedMiMaFilters.scala

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ object Scala2LibraryBootstrappedMiMaFilters {
3131
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.reflect.ManifestFactory#NothingManifest.newArray"),
3232
ProblemFilters.exclude[IncompatibleResultTypeProblem]("scala.reflect.ManifestFactory#NullManifest.newArray"),
3333
ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.collection.immutable.SortedMapOps.coll"),
34-
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.util.Sorting.scala$util$Sorting$$mergeSort$default$5")
3534
)
3635
)
3736

project/ScalaLibraryPlugin.scala

+1
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ object ScalaLibraryPlugin extends AutoPlugin {
102102
"scala/jdk/FunctionWrappers$FromJavaLongUnaryOperator.class",
103103
"scala/collection/ArrayOps$ReverseIterator.class",
104104
"scala/runtime/NonLocalReturnControl.class",
105+
"scala/util/Sorting.class", "scala/util/Sorting$.class", // Contains @specialized annotation
105106
)
106107

107108
}

0 commit comments

Comments
 (0)