Skip to content

Commit 3396412

Browse files
authored
Merge pull request scala#2831 from SethTisue/scala-2.13.11
2 parents 51663e4 + df72f7d commit 3396412

File tree

13 files changed

+34
-38
lines changed

13 files changed

+34
-38
lines changed

_ba/tour/implicit-conversions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ Možete, zato što `Predef` uključuje slj. implicitnu konverziju:
4646
```scala mdoc
4747
import scala.language.implicitConversions
4848

49-
implicit def int2Integer(x: Int) =
50-
java.lang.Integer.valueOf(x)
49+
implicit def int2Integer(x: Int): Integer =
50+
Integer.valueOf(x)
5151
```
5252

5353
Pošto su implicitne konverzije opasne ako se koriste pogrešno, kompajler upozorava kada kompajlira definiciju implicitne konverzije.

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ keywords:
1515
- Document
1616
- Guide
1717

18-
scala-version: 2.13.10
18+
scala-version: 2.13.11
1919
scala-212-version: 2.12.18
2020
scala-3-version: 3.3.0
2121

_ja/tour/implicit-conversions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ implicit def list2ordered[A](x: List[A])
4242
```scala mdoc
4343
import scala.language.implicitConversions
4444

45-
implicit def int2Integer(x: Int) =
46-
java.lang.Integer.valueOf(x)
45+
implicit def int2Integer(x: Int): Integer =
46+
Integer.valueOf(x)
4747
```
4848

4949
暗黙の変換は見境なく使われると落とし穴になり得るため、暗黙の変換の定義をコンパイルしている時にコンパイラは警告を出します。

_ko/tour/implicit-conversions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ previous-page: implicit-parameters
4343
```scala mdoc
4444
import scala.language.implicitConversions
4545

46-
implicit def int2Integer(x: Int) =
47-
java.lang.Integer.valueOf(x)
46+
implicit def int2Integer(x: Int): Integer =
47+
Integer.valueOf(x)
4848
```
4949

5050
암시적 변환이 무분별하게 사용될 경우 잠재적인 위험을 가질 수 있기 때문에, 컴파일러는 암시적 변환의 선언을 컴파일할 시 이를 경고한다.

_overviews/FAQ/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Welcome to Scala 3.2.0 (17.0.3, Java OpenJDK 64-Bit Server VM).
124124
Type in expressions for evaluation. Or try :help.
125125
126126
scala> util.Properties.versionNumberString
127-
val res0: String = 2.13.10
127+
val res0: String = 2.13.11
128128
```
129129

130130
Note that Scala 3 offers
@@ -312,14 +312,14 @@ setting in a multi-project build.
312312

313313
For example, if you add this to your `build.sbt`:
314314

315-
scalaVersion := "2.13.10"
315+
scalaVersion := "2.13.11"
316316

317317
that's a "bare" setting, and you might expect it to apply build-wide.
318318
But it doesn't. _It only applies to the root project._
319319

320320
In many cases one should instead write:
321321

322-
ThisBuild / scalaVersion := "2.13.10"
322+
ThisBuild / scalaVersion := "2.13.11"
323323

324324
Other possibilities include:
325325

_overviews/contribute/bug-reporting-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ If you cannot find your issue in the issue tracker, create a new bug. The detail
6565

6666
Please make sure to fill in as many fields as possible. Make sure you've indicated the following:
6767

68-
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.
68+
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.
6969
2. **The component** that is affected by the bug. For example, the Standard Library, Scaladoc, etc.
7070
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.
7171
4. **Running environment**. Are you running on Linux? Windows? What JVM version are you using?

_overviews/jdk-compatibility/overview.md

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ Sometimes new JVM and JDK (Java Development Kit) versions require us to update S
1212

1313
| JDK version | Minimum Scala versions |
1414
|:-----------:|:-------------------------------------------------------------|
15-
| 21 (ea) | 3.3.1 (soon), 2.13.11 (soon), 2.12.18 |
16-
| 20 | 3.3.0, 2.13.11 (soon), 2.12.18 |
15+
| 21 (ea) | 3.3.1 (soon), 2.13.11, 2.12.18 |
16+
| 20 | 3.3.0, 2.13.11, 2.12.18 |
1717
| 19 | 3.2.0, 2.13.9, 2.12.16 |
1818
| 18 | 3.1.3, 2.13.7, 2.12.15 |
1919
| 17 (LTS) | 3.0.0, 2.13.6, 2.12.15 |
@@ -97,25 +97,17 @@ Support for JDK 19 was included in Scala 2.13.9 and 2.12.16.
9797

9898
JDK 20, a non-LTS release, came out in March 2023.
9999

100-
Support for JDK 20 was included in Scala 3.3.0 and 2.12.18.
101-
102-
Support for JDK 20 has already been merged and is available in
103-
[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)
104-
of 2.13.
105-
106-
The support will be included in the forthcoming Scala release
107-
2.13.11. We expect to release it in June 2023.
100+
Support for JDK 20 was included in Scala 3.3.0, 2.13.11, and 2.12.18.
108101

109102
## JDK 21 compatibility notes
110103

111104
Early access builds of JDK 21 are already available. JDK 21 will
112105
be an LTS release.
113106

114107
Initial support for JDK 21 has been merged and is already available in
115-
Scala 2.12.18 and in nightly builds of Scala 2.13 and Scala 3.
108+
Scala 2.13.11 and 2.12.18 and in nightly builds of Scala 3.
116109

117-
The support will be included in the forthcoming Scala releases
118-
2.13.11 and 3.3.1.
110+
The support will be included in the forthcoming Scala 3.3.1 release.
119111

120112
## GraalVM Native Image compatibility notes
121113

_pl/tour/implicit-conversions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ Przykładowo, kiedy wywołujemy metodę Javy, która wymaga typu `java.lang.Inte
4343
```scala mdoc
4444
import scala.language.implicitConversions
4545

46-
implicit def int2Integer(x: Int) =
47-
java.lang.Integer.valueOf(x)
46+
implicit def int2Integer(x: Int): Integer =
47+
Integer.valueOf(x)
4848
```
4949

5050
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.

_pt-br/tour/implicit-conversions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ Por exemplo, ao chamar um método Java que espera um `java.lang.Integer`, você
4444
```scala mdoc
4545
import scala.language.implicitConversions
4646

47-
implicit def int2Integer(x: Int) =
48-
java.lang.Integer.valueOf(x)
47+
implicit def int2Integer(x: Int): Integer =
48+
Integer.valueOf(x)
4949
```
5050

5151
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.

_ru/tour/implicit-conversions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ implicit def list2ordered[A](x: List[A])
4444
```scala mdoc
4545
import scala.language.implicitConversions
4646

47-
implicit def int2Integer(x: Int) =
48-
java.lang.Integer.valueOf(x)
47+
implicit def int2Integer(x: Int): Integer =
48+
Integer.valueOf(x)
4949
```
5050

5151
Компилятор предупреждает при компиляции об обнаружении неявных преобразований, т.к. неявные преобразования могут иметь разные подводные камни (особенно если использовать их без разбора).

_zh-cn/tour/implicit-conversions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ implicit def list2ordered[A](x: List[A])
4747
```scala mdoc
4848
import scala.language.implicitConversions
4949

50-
implicit def int2Integer(x: Int) =
51-
java.lang.Integer.valueOf(x)
50+
implicit def int2Integer(x: Int): Integer =
51+
Integer.valueOf(x)
5252
```
5353

5454
因为如果不加选择地使用隐式转换可能会导致陷阱,编译器会在编译隐式转换定义时发出警告。

api/all.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ redirect_from:
1010

1111
* Scala 3.3.0 LTS
1212
* [Library API](https://www.scala-lang.org/api/3.3.0/)
13-
* Scala 2.13.10
14-
* [Library API](https://www.scala-lang.org/api/2.13.10/)
15-
* [Compiler API](https://www.scala-lang.org/api/2.13.10/scala-compiler/scala/)
16-
* [Reflection API](https://www.scala-lang.org/api/2.13.10/scala-reflect/scala/reflect/)
13+
* Scala 2.13.11
14+
* [Library API](https://www.scala-lang.org/api/2.13.11/)
15+
* [Compiler API](https://www.scala-lang.org/api/2.13.11/scala-compiler/scala/)
16+
* [Reflection API](https://www.scala-lang.org/api/2.13.11/scala-reflect/scala/reflect/)
1717
* Scala 2.12.18
1818
* [Library API](https://www.scala-lang.org/api/2.12.18/)
1919
* [Compiler API](https://www.scala-lang.org/api/2.12.18/scala-compiler/scala/)
@@ -82,6 +82,10 @@ https://scala-ci.typesafe.com/artifactory/scala-integration/org/scala-lang/
8282
* [Library API](https://www.scala-lang.org/api/3.0.1/)
8383
* Scala 3.0.0
8484
* [Library API](https://www.scala-lang.org/api/3.0.0/)
85+
* Scala 2.13.10
86+
* [Library API](https://www.scala-lang.org/api/2.13.10/)
87+
* [Compiler API](https://www.scala-lang.org/api/2.13.10/scala-compiler/scala/)
88+
* [Reflection API](https://www.scala-lang.org/api/2.13.10/scala-reflect/scala/reflect/)
8589
* Scala 2.13.9
8690
* [Library API](https://www.scala-lang.org/api/2.13.9/)
8791
* [Compiler API](https://www.scala-lang.org/api/2.13.9/scala-compiler/scala/)

scripts/run-mdoc.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/bin/bash
22
set -eux
33

4-
cs launch --scala-version 2.13.10 org.scalameta::mdoc:2.3.3 -- \
4+
cs launch --scala-version 2.13.11 org.scalameta::mdoc:2.3.3 -- \
55
--in . \
66
--out /tmp/mdoc-out/ \
77
--classpath \
8-
$(cs fetch --scala-version 2.13.10 -p \
8+
$(cs fetch --scala-version 2.13.11 -p \
99
com.chuusai::shapeless:2.3.10 \
1010
org.scala-lang::toolkit:0.1.7 \
1111
org.scala-lang::toolkit-test:0.1.7 \

0 commit comments

Comments
 (0)