Skip to content

Commit 3cac39e

Browse files
authored
Scala 2.13.12 (was 2.13.10) (#19454)
backports #18525
2 parents 60b77ed + d20dbbc commit 3cac39e

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed
Submodule stdLib213 updated 489 files

presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -852,8 +852,8 @@ class CompletionSuite extends BaseCompletionSuite:
852852
"""|dynamics scala.languageFeature
853853
|existentials scala.languageFeature
854854
|experimental scala.languageFeature
855-
|higherKinds scala.languageFeature
856855
|implicitConversions scala.languageFeature
856+
|postfixOps scala.languageFeature
857857
|""".stripMargin,
858858
topLines = Some(5)
859859
)

project/Build.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ object Build {
121121
* scala-library.
122122
*/
123123
def stdlibVersion(implicit mode: Mode): String = mode match {
124-
case NonBootstrapped => "2.13.10"
125-
case Bootstrapped => "2.13.10"
124+
case NonBootstrapped => "2.13.12"
125+
case Bootstrapped => "2.13.12"
126126
}
127127

128128
val dottyOrganization = "org.scala-lang"

project/MiMaFilters.scala

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ object MiMaFilters {
1414
ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language#experimental.relaxedExtensionImports"),
1515
ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$experimental$relaxedExtensionImports$"),
1616
// end of New experimental features in 3.3.X
17+
18+
// New in 2.13.12 -- can be removed once scala/scala#10549 lands in 2.13.13
19+
// and we take the upgrade here
20+
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.immutable.MapNodeRemoveAllSetNodeIterator.next"),
1721
)
1822
val TastyCore: Seq[ProblemFilter] = Seq(
1923
)

project/scripts/cmdScaladocTests

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dist/target/pack/bin/scaladoc \
3737
"-snippet-compiler:scaladoc-testcases/docs=compile" \
3838
"-comment-syntax:scaladoc-testcases/src/example/comment-md=markdown,scaladoc-testcases/src/example/comment-wiki=wiki" \
3939
-siteroot scaladoc-testcases/docs \
40-
-project-footer "Copyright (c) 2002-2023, LAMP/EPFL" \
40+
-project-footer "Copyright (c) 2002-2024, LAMP/EPFL" \
4141
-default-template static-site-main \
4242
-author -groups -revision main -project-version "${DOTTY_BOOTSTRAPPED_VERSION}" \
4343
"-quick-links:Learn::https://docs.scala-lang.org/,Install::https://www.scala-lang.org/download/,Playground::https://scastie.scala-lang.org,Find A Library::https://index.scala-lang.org,Community::https://www.scala-lang.org/community/,Blog::https://www.scala-lang.org/blog/," \

0 commit comments

Comments
 (0)