Skip to content

Commit c8000fb

Browse files
committed
Update stdlib-bootstrapped to 2.13.11
1 parent 5c66d7b commit c8000fb

File tree

3 files changed

+26
-7
lines changed

3 files changed

+26
-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,19 +994,19 @@ 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
),
10051008
tastyMiMaTastyQueryVersionOverride := Some("0.8.4"),
1006-
tastyMiMaPreviousArtifacts += "org.scala-lang" % "scala-library" % stdlibVersion(Bootstrapped),
1009+
tastyMiMaPreviousArtifacts += "org.scala-lang" % "scala-library" % stdlibBootstrappedVersion,
10071010
tastyMiMaCurrentClasspath := {
10081011
val javaBootCp = tastyMiMaJavaBootClasspath.value
10091012
val classDir = (Compile / classDirectory).value.toPath()
@@ -1110,7 +1113,7 @@ object Build {
11101113
javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value,
11111114
Test / javaOptions += "-Ddotty.scala.library=" + (`stdlib-bootstrapped` / Compile / packageBin).value.getAbsolutePath,
11121115
Compile / compile / fullClasspath ~= {
1113-
_.filterNot(file => file.data.getName == s"scala-library-${stdlibVersion(Bootstrapped)}.jar")
1116+
_.filterNot(file => file.data.getName == s"scala-library-$stdlibBootstrappedVersion.jar")
11141117
},
11151118
Compile / compile / dependencyClasspath := {
11161119
// make sure that the scala2-library (tasty of `stdlib-bootstrapped-tasty`) is listed before the scala-library (classfiles)

project/MiMaFilters.scala

Lines changed: 13 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+
"2.13.11" -> {
2727
Seq(
2828
// Files that are not compiled in the bootstrapped library
2929
ProblemFilters.exclude[MissingClassProblem]("scala.AnyVal"),
@@ -117,6 +117,9 @@ object MiMaFilters {
117117
ProblemFilters.exclude[MissingFieldProblem]("scala.collection.ArrayOps#ReverseIterator.xs"),
118118
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.NonLocalReturnControl.value"),
119119
ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.collection.immutable.SortedMapOps.coll"),
120+
121+
// New in 2.13.11
122+
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.IterableOnceOps#Maximized.this"),
120123
) ++
121124
Seq( // DirectMissingMethodProblem
122125
"scala.collection.immutable.ArraySeq#*.elemTag",
@@ -144,7 +147,7 @@ object MiMaFilters {
144147
)
145148

146149
val StdlibBootstrappedForward: Map[String, Seq[ProblemFilter]] = Map(
147-
"2.13.10" -> {
150+
"2.13.11" -> {
148151
Seq(
149152
// Scala language features
150153
ProblemFilters.exclude[FinalClassProblem]("scala.languageFeature$*$"),
@@ -195,6 +198,14 @@ object MiMaFilters {
195198

196199
// abstract method coll()scala.collection.immutable.SortedMapOps in interface scala.collection.immutable.SortedMapOps is present only in other version
197200
ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.collection.immutable.SortedMapOps.coll"),
201+
202+
// New in 2.13.11
203+
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.IterableOnceOps#Maximized.this"),
204+
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.mutable.LinkedHashMap.defaultLoadFactor"),
205+
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.mutable.LinkedHashMap.defaultinitialSize"),
206+
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.mutable.LinkedHashSet.defaultLoadFactor"),
207+
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.mutable.LinkedHashSet.defaultinitialSize"),
208+
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.mutable.OpenHashMap.nextPositivePowerOfTwo"),
198209
) ++
199210
Seq( // DirectMissingMethodProblem
200211
"scala.<:<.antisymm", "scala.<:<.refl",

project/TastyMiMaFilters.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,10 @@ object TastyMiMaFilters {
8484
ProblemMatcher.make(ProblemKind.InternalError, "scala.collection.SeqView.concat"),
8585
ProblemMatcher.make(ProblemKind.InternalError, "scala.collection.SeqView.prependedAll"),
8686
ProblemMatcher.make(ProblemKind.InternalError, "scala.concurrent.duration.package.*"),
87+
88+
// Problems introduced in 2.13.11
89+
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.BuildFromLowPriority1.buildFromSortedSetOps"),
90+
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.BuildFrom.buildFromMapOps"),
91+
ProblemMatcher.make(ProblemKind.IncompatibleTypeChange, "scala.collection.BuildFrom.buildFromSortedMapOps"),
8792
)
8893
}

0 commit comments

Comments
 (0)