From 53019d79e7c861791c7022ac02689e03a07fc5d6 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 1 Jun 2023 16:32:46 -0700 Subject: [PATCH 1/4] Scala 2.13.11 --- _config.yml | 2 +- _overviews/FAQ/index.md | 6 +++--- _overviews/contribute/bug-reporting-guide.md | 2 +- api/all.md | 12 ++++++++---- scripts/run-mdoc.sh | 4 ++-- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/_config.yml b/_config.yml index fcf35a3fac..10eda71ecd 100644 --- a/_config.yml +++ b/_config.yml @@ -15,7 +15,7 @@ keywords: - Document - Guide -scala-version: 2.13.10 +scala-version: 2.13.11 scala-212-version: 2.12.17 scala-3-version: 3.3.0 diff --git a/_overviews/FAQ/index.md b/_overviews/FAQ/index.md index ca4538daae..0420ecc64b 100644 --- a/_overviews/FAQ/index.md +++ b/_overviews/FAQ/index.md @@ -124,7 +124,7 @@ Welcome to Scala 3.2.0 (17.0.3, Java OpenJDK 64-Bit Server VM). Type in expressions for evaluation. Or try :help. scala> util.Properties.versionNumberString -val res0: String = 2.13.10 +val res0: String = 2.13.11 ``` Note that Scala 3 offers @@ -312,14 +312,14 @@ setting in a multi-project build. For example, if you add this to your `build.sbt`: - scalaVersion := "2.13.10" + scalaVersion := "2.13.11" that's a "bare" setting, and you might expect it to apply build-wide. But it doesn't. _It only applies to the root project._ In many cases one should instead write: - ThisBuild / scalaVersion := "2.13.10" + ThisBuild / scalaVersion := "2.13.11" Other possibilities include: diff --git a/_overviews/contribute/bug-reporting-guide.md b/_overviews/contribute/bug-reporting-guide.md index c59279877e..9787238073 100644 --- a/_overviews/contribute/bug-reporting-guide.md +++ b/_overviews/contribute/bug-reporting-guide.md @@ -65,7 +65,7 @@ If you cannot find your issue in the issue tracker, create a new bug. The detail Please make sure to fill in as many fields as possible. Make sure you've indicated the following: - 1. **Exact Scala version** that you are using. For example, `2.13.10` or `3.2.0`. If the bug happens in multiple versions indicate all of them. + 1. **Exact Scala version** that you are using. For example, `2.13.11` or `3.3.0`. If the bug happens in multiple versions indicate all of them. 2. **The component** that is affected by the bug. For example, the Standard Library, Scaladoc, etc. 3. **Labels** related to your issue. For example, if you think your issue is related to the typechecker, and if you have successfully minimized your issue, label your bug as "typechecker" and "minimized". Issue tracker will suggest names for existing labels as you type them so try not to create duplicates. 4. **Running environment**. Are you running on Linux? Windows? What JVM version are you using? diff --git a/api/all.md b/api/all.md index 3204c6a3c2..2512f5a4ab 100644 --- a/api/all.md +++ b/api/all.md @@ -10,10 +10,10 @@ redirect_from: * Scala 3.3.0 LTS * [Library API](https://www.scala-lang.org/api/3.3.0/) -* Scala 2.13.10 - * [Library API](https://www.scala-lang.org/api/2.13.10/) - * [Compiler API](https://www.scala-lang.org/api/2.13.10/scala-compiler/scala/) - * [Reflection API](https://www.scala-lang.org/api/2.13.10/scala-reflect/scala/reflect/) +* Scala 2.13.11 + * [Library API](https://www.scala-lang.org/api/2.13.11/) + * [Compiler API](https://www.scala-lang.org/api/2.13.11/scala-compiler/scala/) + * [Reflection API](https://www.scala-lang.org/api/2.13.11/scala-reflect/scala/reflect/) * Scala 2.12.17 * [Library API](https://www.scala-lang.org/api/2.12.17/) * [Compiler API](https://www.scala-lang.org/api/2.12.17/scala-compiler/scala/) @@ -82,6 +82,10 @@ https://scala-ci.typesafe.com/artifactory/scala-integration/org/scala-lang/ * [Library API](https://www.scala-lang.org/api/3.0.1/) * Scala 3.0.0 * [Library API](https://www.scala-lang.org/api/3.0.0/) +* Scala 2.13.10 + * [Library API](https://www.scala-lang.org/api/2.13.10/) + * [Compiler API](https://www.scala-lang.org/api/2.13.10/scala-compiler/scala/) + * [Reflection API](https://www.scala-lang.org/api/2.13.10/scala-reflect/scala/reflect/) * Scala 2.13.9 * [Library API](https://www.scala-lang.org/api/2.13.9/) * [Compiler API](https://www.scala-lang.org/api/2.13.9/scala-compiler/scala/) diff --git a/scripts/run-mdoc.sh b/scripts/run-mdoc.sh index a4f4acbe2a..d74316b9c0 100755 --- a/scripts/run-mdoc.sh +++ b/scripts/run-mdoc.sh @@ -1,11 +1,11 @@ #!/bin/bash set -eux -cs launch --scala-version 2.13.10 org.scalameta::mdoc:2.3.3 -- \ +cs launch --scala-version 2.13.11 org.scalameta::mdoc:2.3.3 -- \ --in . \ --out /tmp/mdoc-out/ \ --classpath \ - $(cs fetch --scala-version 2.13.10 -p \ + $(cs fetch --scala-version 2.13.11 -p \ com.chuusai::shapeless:2.3.10 \ org.scala-lang::toolkit:0.1.7 \ org.scala-lang::toolkit-test:0.1.7 \ From 9172460ffef0cb965578229d831623ae19c5df16 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 7 Jun 2023 09:22:27 -0700 Subject: [PATCH 2/4] update JDK compat page for 2.13.11 --- _overviews/jdk-compatibility/overview.md | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/_overviews/jdk-compatibility/overview.md b/_overviews/jdk-compatibility/overview.md index 2203b6dd31..2f4bcf10d2 100644 --- a/_overviews/jdk-compatibility/overview.md +++ b/_overviews/jdk-compatibility/overview.md @@ -12,8 +12,8 @@ Sometimes new JVM and JDK (Java Development Kit) versions require us to update S | JDK version | Minimum Scala versions | |:-----------:|:-------------------------------------------------------------| -| 21 (ea) | 3.3.1 (soon), 2.13.11 (soon), 2.12.18 | -| 20 | 3.3.0, 2.13.11 (soon), 2.12.18 | +| 21 (ea) | 3.3.1 (soon), 2.13.11, 2.12.18 | +| 20 | 3.3.0, 2.13.11, 2.12.18 | | 19 | 3.2.0, 2.13.9, 2.12.16 | | 18 | 3.1.3, 2.13.7, 2.12.15 | | 17 (LTS) | 3.0.0, 2.13.6, 2.12.15 | @@ -97,14 +97,7 @@ Support for JDK 19 was included in Scala 2.13.9 and 2.12.16. JDK 20, a non-LTS release, came out in March 2023. -Support for JDK 20 was included in Scala 3.3.0 and 2.12.18. - -Support for JDK 20 has already been merged and is available in -[nightly builds](https://stackoverflow.com/questions/40622878/how-do-i-tell-sbt-or-scala-cli-to-use-a-nightly-build-of-scala-2-12-or-2-13) -of 2.13. - -The support will be included in the forthcoming Scala release -2.13.11. We expect to release it in June 2023. +Support for JDK 20 was included in Scala 3.3.0, 2.13.11, and 2.12.18. ## JDK 21 compatibility notes @@ -112,10 +105,9 @@ Early access builds of JDK 21 are already available. JDK 21 will be an LTS release. Initial support for JDK 21 has been merged and is already available in -Scala 2.12.18 and in nightly builds of Scala 2.13 and Scala 3. +Scala 2.13.11 and 2.12.18 and in nightly builds of Scala 3. -The support will be included in the forthcoming Scala releases -2.13.11 and 3.3.1. +The support will be included in the forthcoming Scala 3.3.1 release. ## GraalVM Native Image compatibility notes From de7ee299824383acf05494a429cca04ba7c76c55 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 7 Jun 2023 09:28:41 -0700 Subject: [PATCH 3/4] fix mdoc errors --- _ba/tour/implicit-conversions.md | 4 ++-- _ja/tour/implicit-conversions.md | 4 ++-- _ko/tour/implicit-conversions.md | 4 ++-- _pl/tour/implicit-conversions.md | 4 ++-- _ru/tour/implicit-conversions.md | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/_ba/tour/implicit-conversions.md b/_ba/tour/implicit-conversions.md index d794590c45..5a1ea3b9fa 100644 --- a/_ba/tour/implicit-conversions.md +++ b/_ba/tour/implicit-conversions.md @@ -46,8 +46,8 @@ Možete, zato što `Predef` uključuje slj. implicitnu konverziju: ```scala mdoc import scala.language.implicitConversions -implicit def int2Integer(x: Int) = - java.lang.Integer.valueOf(x) +implicit def int2Integer(x: Int): Integer = + Integer.valueOf(x) ``` Pošto su implicitne konverzije opasne ako se koriste pogrešno, kompajler upozorava kada kompajlira definiciju implicitne konverzije. diff --git a/_ja/tour/implicit-conversions.md b/_ja/tour/implicit-conversions.md index d4de2375f3..dbf1440872 100644 --- a/_ja/tour/implicit-conversions.md +++ b/_ja/tour/implicit-conversions.md @@ -42,8 +42,8 @@ implicit def list2ordered[A](x: List[A]) ```scala mdoc import scala.language.implicitConversions -implicit def int2Integer(x: Int) = - java.lang.Integer.valueOf(x) +implicit def int2Integer(x: Int): Integer = + Integer.valueOf(x) ``` 暗黙の変換は見境なく使われると落とし穴になり得るため、暗黙の変換の定義をコンパイルしている時にコンパイラは警告を出します。 diff --git a/_ko/tour/implicit-conversions.md b/_ko/tour/implicit-conversions.md index 41aa47856e..d5af6dac66 100644 --- a/_ko/tour/implicit-conversions.md +++ b/_ko/tour/implicit-conversions.md @@ -43,8 +43,8 @@ previous-page: implicit-parameters ```scala mdoc import scala.language.implicitConversions -implicit def int2Integer(x: Int) = - java.lang.Integer.valueOf(x) +implicit def int2Integer(x: Int): Integer = + Integer.valueOf(x) ``` 암시적 변환이 무분별하게 사용될 경우 잠재적인 위험을 가질 수 있기 때문에, 컴파일러는 암시적 변환의 선언을 컴파일할 시 이를 경고한다. diff --git a/_pl/tour/implicit-conversions.md b/_pl/tour/implicit-conversions.md index d859139ee8..950bbd1458 100644 --- a/_pl/tour/implicit-conversions.md +++ b/_pl/tour/implicit-conversions.md @@ -43,8 +43,8 @@ Przykładowo, kiedy wywołujemy metodę Javy, która wymaga typu `java.lang.Inte ```scala mdoc import scala.language.implicitConversions -implicit def int2Integer(x: Int) = - java.lang.Integer.valueOf(x) +implicit def int2Integer(x: Int): Integer = + Integer.valueOf(x) ``` Aby zdefiniować własne konwersje niejawne, należy zaimportować `scala.language.implicitConversions` (albo uruchomić kompilator z opcją `-language:implicitConversions`). Ta funkcjonalność musi być włączona jawnie ze względu na problemy, jakie mogą się wiązać z ich nadmiernym stosowaniem. diff --git a/_ru/tour/implicit-conversions.md b/_ru/tour/implicit-conversions.md index 77eb2c9c46..069c9be697 100644 --- a/_ru/tour/implicit-conversions.md +++ b/_ru/tour/implicit-conversions.md @@ -44,8 +44,8 @@ implicit def list2ordered[A](x: List[A]) ```scala mdoc import scala.language.implicitConversions -implicit def int2Integer(x: Int) = - java.lang.Integer.valueOf(x) +implicit def int2Integer(x: Int): Integer = + Integer.valueOf(x) ``` Компилятор предупреждает при компиляции об обнаружении неявных преобразований, т.к. неявные преобразования могут иметь разные подводные камни (особенно если использовать их без разбора). From df72f7d160285af1a6213a617261cbc879d522bc Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 7 Jun 2023 09:32:53 -0700 Subject: [PATCH 4/4] oops --- _pt-br/tour/implicit-conversions.md | 4 ++-- _zh-cn/tour/implicit-conversions.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_pt-br/tour/implicit-conversions.md b/_pt-br/tour/implicit-conversions.md index cc96f99062..61ee6cac54 100644 --- a/_pt-br/tour/implicit-conversions.md +++ b/_pt-br/tour/implicit-conversions.md @@ -44,8 +44,8 @@ Por exemplo, ao chamar um método Java que espera um `java.lang.Integer`, você ```scala mdoc import scala.language.implicitConversions -implicit def int2Integer(x: Int) = - java.lang.Integer.valueOf(x) +implicit def int2Integer(x: Int): Integer = + Integer.valueOf(x) ``` Para definir suas próprias conversões implícitas, primeiro você deve importar `scala.language.implicitConversions` (ou invocar o compilador com a opção `-language: implicitConversions`). Tal recurso deve ser explicitamente habilitado porque pode se tornar complexo se usado indiscriminadamente. diff --git a/_zh-cn/tour/implicit-conversions.md b/_zh-cn/tour/implicit-conversions.md index 48049bc249..4c2d94cc0b 100644 --- a/_zh-cn/tour/implicit-conversions.md +++ b/_zh-cn/tour/implicit-conversions.md @@ -47,8 +47,8 @@ implicit def list2ordered[A](x: List[A]) ```scala mdoc import scala.language.implicitConversions -implicit def int2Integer(x: Int) = - java.lang.Integer.valueOf(x) +implicit def int2Integer(x: Int): Integer = + Integer.valueOf(x) ``` 因为如果不加选择地使用隐式转换可能会导致陷阱，编译器会在编译隐式转换定义时发出警告。