From f67d50b8fb08459be306e114819bb4eafc8d3db1 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 7 Sep 2023 10:49:04 +0200 Subject: [PATCH 1/2] Scala 2.13.12 --- community-build/community-projects/stdLib213 | 2 +- project/Build.scala | 6 +++--- project/MiMaFilters.scala | 3 +++ 3 files changed, 7 insertions(+), 4 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/project/Build.scala b/project/Build.scala index ee1ed242e1b2..0766ae707d7f 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -123,8 +123,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" } /** Version of the scala-library for which we will generate TASTy. @@ -134,7 +134,7 @@ object Build { * We can use nightly versions to tests the future compatibility in development. * Nightly versions: https://scala-ci.typesafe.com/ui/native/scala-integration/org/scala-lang */ - val stdlibBootstrappedVersion = "2.13.12-bin-364ee69" + val stdlibBootstrappedVersion = "2.13.12" val dottyOrganization = "org.scala-lang" val dottyGithubUrl = "https://github.com/lampepfl/dotty" diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala index fc7b1e29bafc..8937b30084ef 100644 --- a/project/MiMaFilters.scala +++ b/project/MiMaFilters.scala @@ -90,6 +90,9 @@ object MiMaFilters { "scala.collection.IterableOnceOps#Maximized.this", // New in 2.13.11: private inner class "scala.util.Properties.", "scala.util.Sorting.scala$util$Sorting$$mergeSort$default$5", + // New in 2.13.12 -- can be removed once scala/scala#10549 lands in 2.13.13 + // and we take the upgrade here + "scala.collection.immutable.MapNodeRemoveAllSetNodeIterator.next", ).map(ProblemFilters.exclude[DirectMissingMethodProblem]) } ) From b66c2cd5db72335f5f01af1a7718bc68a8c98d46 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 20 Sep 2023 16:37:06 +0200 Subject: [PATCH 2/2] update a test case (languageFeature.higherKinds was deprecated) --- .../test/dotty/tools/pc/tests/completion/CompletionSuite.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) )