From d20dbbca2afc7e8ca88c2246ffbed56e0cede844 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 7 Sep 2023 10:49:04 +0200 Subject: [PATCH] Scala 2.13.12 --- community-build/community-projects/stdLib213 | 2 +- .../dotty/tools/pc/tests/completion/CompletionSuite.scala | 2 +- project/Build.scala | 4 ++-- project/MiMaFilters.scala | 4 ++++ project/scripts/cmdScaladocTests | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/community-build/community-projects/stdLib213 b/community-build/community-projects/stdLib213 index 6243e902928c..88383e58f82c 160000 --- a/community-build/community-projects/stdLib213 +++ b/community-build/community-projects/stdLib213 @@ -1 +1 @@ -Subproject commit 6243e902928c344fb0e82e21120bb257f08a2af2 +Subproject commit 88383e58f82cd728afc9316081c2350489c39943 diff --git a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala index 6ff955afc94a..313013c34de1 100644 --- a/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala +++ b/presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionSuite.scala @@ -852,8 +852,8 @@ class CompletionSuite extends BaseCompletionSuite: """|dynamics scala.languageFeature |existentials scala.languageFeature |experimental scala.languageFeature - |higherKinds scala.languageFeature |implicitConversions scala.languageFeature + |postfixOps scala.languageFeature |""".stripMargin, topLines = Some(5) ) diff --git a/project/Build.scala b/project/Build.scala index d4ff3424ff7b..9be7621d7ff9 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -121,8 +121,8 @@ object Build { * scala-library. */ def stdlibVersion(implicit mode: Mode): String = mode match { - case NonBootstrapped => "2.13.10" - case Bootstrapped => "2.13.10" + case NonBootstrapped => "2.13.12" + case Bootstrapped => "2.13.12" } val dottyOrganization = "org.scala-lang" diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala index 112a5601615c..03b8e93639bc 100644 --- a/project/MiMaFilters.scala +++ b/project/MiMaFilters.scala @@ -14,6 +14,10 @@ object MiMaFilters { ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language#experimental.relaxedExtensionImports"), ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$experimental$relaxedExtensionImports$"), // end of New experimental features in 3.3.X + + // New in 2.13.12 -- can be removed once scala/scala#10549 lands in 2.13.13 + // and we take the upgrade here + ProblemFilters.exclude[DirectMissingMethodProblem]("scala.collection.immutable.MapNodeRemoveAllSetNodeIterator.next"), ) val TastyCore: Seq[ProblemFilter] = Seq( ) diff --git a/project/scripts/cmdScaladocTests b/project/scripts/cmdScaladocTests index 2168e3e8e334..87a7d118a666 100755 --- a/project/scripts/cmdScaladocTests +++ b/project/scripts/cmdScaladocTests @@ -37,7 +37,7 @@ dist/target/pack/bin/scaladoc \ "-snippet-compiler:scaladoc-testcases/docs=compile" \ "-comment-syntax:scaladoc-testcases/src/example/comment-md=markdown,scaladoc-testcases/src/example/comment-wiki=wiki" \ -siteroot scaladoc-testcases/docs \ - -project-footer "Copyright (c) 2002-2023, LAMP/EPFL" \ + -project-footer "Copyright (c) 2002-2024, LAMP/EPFL" \ -default-template static-site-main \ -author -groups -revision main -project-version "${DOTTY_BOOTSTRAPPED_VERSION}" \ "-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/," \