From 7c7626fa17ebaeeb0d0a43fc012c17101733e716 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Mon, 19 Sep 2022 13:48:49 -0700 Subject: [PATCH] Scala 2.13.10 (was 2.13.8) --- community-build/community-projects/play-json | 2 +- community-build/community-projects/stdLib213 | 2 +- project/Build.scala | 4 ++-- .../scaladoc/ExternalLocationProviderIntegrationTest.scala | 4 ++-- tests/neg/i11982.check | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/community-build/community-projects/play-json b/community-build/community-projects/play-json index ac0fcf24a176..356b7044ed3e 160000 --- a/community-build/community-projects/play-json +++ b/community-build/community-projects/play-json @@ -1 +1 @@ -Subproject commit ac0fcf24a17657a7ed61be34ed792d4fd8d05293 +Subproject commit 356b7044ed3efd6cf9350eb9930be6abd4906b6e diff --git a/community-build/community-projects/stdLib213 b/community-build/community-projects/stdLib213 index 2c742834cf16..986dcc160aab 160000 --- a/community-build/community-projects/stdLib213 +++ b/community-build/community-projects/stdLib213 @@ -1 +1 @@ -Subproject commit 2c742834cf162ab89e914bbc0a8b975874a2c3c2 +Subproject commit 986dcc160aab85298f6cab0bf8dd0345497cdc01 diff --git a/project/Build.scala b/project/Build.scala index fc7aa12d2596..a8aaf3f2f3b4 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -120,8 +120,8 @@ object Build { * scala-library. */ def stdlibVersion(implicit mode: Mode): String = mode match { - case NonBootstrapped => "2.13.8" - case Bootstrapped => "2.13.8" + case NonBootstrapped => "2.13.10" + case Bootstrapped => "2.13.10" } val dottyOrganization = "org.scala-lang" diff --git a/scaladoc/test/dotty/tools/scaladoc/ExternalLocationProviderIntegrationTest.scala b/scaladoc/test/dotty/tools/scaladoc/ExternalLocationProviderIntegrationTest.scala index c1fc8f8cb044..59e274749f26 100644 --- a/scaladoc/test/dotty/tools/scaladoc/ExternalLocationProviderIntegrationTest.scala +++ b/scaladoc/test/dotty/tools/scaladoc/ExternalLocationProviderIntegrationTest.scala @@ -33,7 +33,7 @@ class Scaladoc2ExternalLocationProviderIntegrationTest extends ExternalLocationP "https://www.scala-lang.org/api/current/scala/util/matching/Regex$$Match.html", "https://www.scala-lang.org/api/current/scala/Predef$.html#String", "https://www.scala-lang.org/api/current/scala/collection/immutable/Map.html", - "https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#addString(b:StringBuilder,start:String,sep:String,end:String):StringBuilder", + "https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#addString(b:StringBuilder,start:String,sep:String,end:String):b.type", "https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#mkString(start:String,sep:String,end:String):String", "https://external.stubs/api/tests/externalStubs/$div$bslash$.html", "https://external.stubs/api/tests/externalStubs/$bslash$div$.html" @@ -67,7 +67,7 @@ class Scaladoc2LegacyExternalLocationProviderIntegrationTest extends LegacyExter "https://www.scala-lang.org/api/current/scala/util/matching/Regex$$Match.html", "https://www.scala-lang.org/api/current/scala/Predef$.html#String", "https://www.scala-lang.org/api/current/scala/collection/immutable/Map.html", - "https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#addString(b:StringBuilder,start:String,sep:String,end:String):StringBuilder", + "https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#addString(b:StringBuilder,start:String,sep:String,end:String):b.type", "https://www.scala-lang.org/api/current/scala/collection/IterableOnceOps.html#mkString(start:String,sep:String,end:String):String" ) ) diff --git a/tests/neg/i11982.check b/tests/neg/i11982.check index d18fc31d68e7..48ec252a4410 100644 --- a/tests/neg/i11982.check +++ b/tests/neg/i11982.check @@ -1,4 +1,4 @@ -- Error: tests/neg/i11982.scala:22:38 --------------------------------------------------------------------------------- 22 | val p1: ("msg", 42) = unpair[Tshape] // error: no singleton value for Any | ^ - | No singleton value available for Any. + |No singleton value available for Any; eligible singleton types for `ValueOf` synthesis include literals and stable paths.