Skip to content

Commit ae09082

Browse files
committed
Update stdlib-bootstrapped to 2.13.11
1 parent 98b452d commit ae09082

File tree

3 files changed

+23
-7
lines changed

3 files changed

+23
-7
lines changed

project/Build.scala

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@ object Build {
127127
case Bootstrapped => "2.13.10"
128128
}
129129

130+
/** Version of the scala-library for which we will generate TASTy. */
131+
val stdlibBootstrappedVersion = "2.13.11"
132+
130133
val dottyOrganization = "org.scala-lang"
131134
val dottyGithubUrl = "https://github.com/lampepfl/dotty"
132135
val dottyGithubRawUserContentUrl = "https://raw.githubusercontent.com/lampepfl/dotty"
@@ -948,7 +951,7 @@ object Build {
948951
ivyConfigurations += SourceDeps.hide,
949952
transitiveClassifiers := Seq("sources"),
950953
libraryDependencies +=
951-
("org.scala-lang" % "scala-library" % stdlibVersion(Bootstrapped) % "sourcedeps"),
954+
("org.scala-lang" % "scala-library" % stdlibBootstrappedVersion % "sourcedeps"),
952955
(Compile / sourceGenerators) += Def.task {
953956
val s = streams.value
954957
val cacheDir = s.cacheDirectory
@@ -991,18 +994,18 @@ object Build {
991994
files.filterNot(_.relativeTo(reference).exists(overwritenSources))
992995
},
993996
(Test / managedClasspath) ~= {
994-
_.filterNot(file => file.data.getName == s"scala-library-${stdlibVersion(Bootstrapped)}.jar")
997+
_.filterNot(file => file.data.getName == s"scala-library-$stdlibBootstrappedVersion.jar")
995998
},
996999
mimaCheckDirection := "both",
9971000
mimaBackwardIssueFilters := MiMaFilters.StdlibBootstrappedBackwards,
9981001
mimaForwardIssueFilters := MiMaFilters.StdlibBootstrappedForward,
999-
mimaPreviousArtifacts += "org.scala-lang" % "scala-library" % stdlibVersion(Bootstrapped),
1002+
mimaPreviousArtifacts += "org.scala-lang" % "scala-library" % stdlibBootstrappedVersion,
10001003
mimaExcludeAnnotations ++= Seq(
10011004
"scala.annotation.experimental",
10021005
"scala.annotation.specialized",
10031006
"scala.annotation.unspecialized",
10041007
),
1005-
tastyMiMaPreviousArtifacts += "org.scala-lang" % "scala-library" % stdlibVersion(Bootstrapped),
1008+
tastyMiMaPreviousArtifacts += "org.scala-lang" % "scala-library" % stdlibBootstrappedVersion,
10061009
tastyMiMaCurrentClasspath := {
10071010
val javaBootCp = tastyMiMaJavaBootClasspath.value
10081011
val classDir = (Compile / classDirectory).value.toPath()
@@ -1109,7 +1112,7 @@ object Build {
11091112
javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value,
11101113
Test / javaOptions += "-Ddotty.scala.library=" + (`stdlib-bootstrapped` / Compile / packageBin).value.getAbsolutePath,
11111114
Compile / compile / fullClasspath ~= {
1112-
_.filterNot(file => file.data.getName == s"scala-library-${stdlibVersion(Bootstrapped)}.jar")
1115+
_.filterNot(file => file.data.getName == s"scala-library-$stdlibBootstrappedVersion.jar")
11131116
},
11141117
Compile / compile / dependencyClasspath := {
11151118
// make sure that the scala2-library (tasty of `stdlib-bootstrapped-tasty`) is listed before the scala-library (classfiles)

project/MiMaFilters.scala

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ object MiMaFilters {
2323
)
2424

2525
val StdlibBootstrappedBackwards: Map[String, Seq[ProblemFilter]] = Map(
26-
"2.13.10" -> {
26+
Build.stdlibBootstrappedVersion -> {
2727
Seq(
2828
// Files that are not compiled in the bootstrapped library
2929
ProblemFilters.exclude[MissingClassProblem]("scala.AnyVal"),
@@ -134,12 +134,13 @@ object MiMaFilters {
134134
"scala.runtime.Rich*.num", "scala.runtime.Rich*.ord",
135135
"scala.util.Properties.<clinit>",
136136
"scala.util.Sorting.scala$util$Sorting$$mergeSort$default$5",
137+
"scala.collection.IterableOnceOps#Maximized.this" // New in 2.13.11: private inner class
137138
).map(ProblemFilters.exclude[DirectMissingMethodProblem])
138139
}
139140
)
140141

141142
val StdlibBootstrappedForward: Map[String, Seq[ProblemFilter]] = Map(
142-
"2.13.10" -> {
143+
Build.stdlibBootstrappedVersion -> {
143144
Seq(
144145
// Scala language features
145146
ProblemFilters.exclude[FinalClassProblem]("scala.languageFeature$*$"),
@@ -236,6 +237,13 @@ object MiMaFilters {
236237
"scala.util.Properties.coloredOutputEnabled",
237238
"scala.util.Properties.isAvian",
238239
"scala.util.Properties.versionFor",
240+
// New problem in 2.13.11
241+
"scala.collection.IterableOnceOps#Maximized.this", // private inner class
242+
"scala.collection.mutable.LinkedHashMap.defaultLoadFactor", // private[collection] final def
243+
"scala.collection.mutable.LinkedHashMap.defaultinitialSize", // private[collection] final def
244+
"scala.collection.mutable.LinkedHashSet.defaultLoadFactor", // private[collection] final def
245+
"scala.collection.mutable.LinkedHashSet.defaultinitialSize", // private[collection] final def
246+
"scala.collection.mutable.OpenHashMap.nextPositivePowerOfTwo", // private[mutable] def
239247
).map(ProblemFilters.exclude[DirectMissingMethodProblem]) ++
240248
Seq( // MissingFieldProblem: static field ... in object ... does not have a correspondent in other version
241249
"scala.Array.UnapplySeqWrapper",

project/TastyMiMaFilters.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,10 @@ object TastyMiMaFilters {
7272
ProblemMatcher.make(ProblemKind.InternalError, "scala.collection.SeqView.concat"),
7373
ProblemMatcher.make(ProblemKind.InternalError, "scala.collection.SeqView.prependedAll"),
7474
ProblemMatcher.make(ProblemKind.InternalError, "scala.concurrent.duration.package.*"),
75+
76+
// Problems introduced in 2.13.11
77+
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.BuildFromLowPriority1.buildFromSortedSetOps"), // The symbol scala.collection.BuildFromLowPriority1.buildFromSortedSetOps has an incompatible type in current version: before: [CC <: ([X] =>> (scala.collection.SortedSet[X] & scala.collection.SortedSetOps[X, CC, ?])), A0, A](evidence$3: scala.package.Ordering[A])scala.collection.BuildFrom[(CC[A0] & scala.collection.SortedSet[A0]), A, (CC[A] & scala.collection.SortedSet[A])]; after: [CC >: ([X] =>> scala.Nothing) <: ([X] =>> scala.&[scala.collection.SortedSet[X], scala.collection.SortedSetOps[X, CC, ?]]), A0, A](evidence$3: scala.package.Ordering[A])scala.collection.BuildFrom[scala.&[CC[A0], scala.collection.SortedSet[A0]], A, scala.&[CC[A], scala.collection.SortedSet[A]]]
78+
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.BuildFrom.buildFromMapOps"), // The symbol scala.collection.BuildFrom.buildFromMapOps has an incompatible type in current version: before: [CC <: ([X, Y] =>> (scala.collection.Map[X, Y] & scala.collection.MapOps[X, Y, CC, ?])), K0, V0, K, V]scala.collection.BuildFrom[(CC[K0, V0] & scala.collection.Map[K0, V0]), scala.Tuple2[K, V], (CC[K, V] & scala.collection.Map[K, V])]; after: [CC >: ([X, Y] =>> scala.Nothing) <: ([X, Y] =>> scala.&[scala.collection.Map[X, Y], scala.collection.MapOps[X, Y, CC, ?]]), K0, V0, K, V]scala.collection.BuildFrom[scala.&[CC[K0, V0], scala.collection.Map[K0, V0]], scala.Tuple2[K, V], scala.&[CC[K, V], scala.collection.Map[K, V]]]
79+
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.BuildFrom.buildFromSortedMapOps"), // The symbol scala.collection.BuildFrom.buildFromSortedMapOps has an incompatible type in current version: before: [CC <: ([X, Y] =>> (scala.collection.SortedMap[X, Y] & scala.collection.SortedMapOps[X, Y, CC, ?])), K0, V0, K, V](evidence$1: scala.package.Ordering[K])scala.collection.BuildFrom[(CC[K0, V0] & scala.collection.SortedMap[K0, V0]), scala.Tuple2[K, V], (CC[K, V] & scala.collection.SortedMap[K, V])]; after: [CC >: ([X, Y] =>> scala.Nothing) <: ([X, Y] =>> scala.&[scala.collection.SortedMap[X, Y], scala.collection.SortedMapOps[X, Y, CC, ?]]), K0, V0, K, V](evidence$1: scala.package.Ordering[K])scala.collection.BuildFrom[scala.&[CC[K0, V0], scala.collection.SortedMap[K0, V0]], scala.Tuple2[K, V], scala.&[CC[K, V], scala.collection.SortedMap[K, V]]]
7580
)
7681
}

0 commit comments

Comments
 (0)