Skip to content

Commit 58215d2

Browse files
authored
Merge pull request #2897 from SethTisue/scala-2.13.12
2 parents 0d91e97 + 0e533cd commit 58215d2

File tree

6 files changed

+20
-12
lines changed

6 files changed

+20
-12
lines changed

_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.11
18+
scala-version: 2.13.12
1919
scala-212-version: 2.12.18
2020
scala-3-version: 3.3.1
2121

_overviews/FAQ/index.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,18 @@ with only minor supplements. That's why `versionString` and
120120
`versionNumberString` report that Scala 2 is in use:
121121

122122
```
123-
Welcome to Scala 3.2.0 (17.0.3, Java OpenJDK 64-Bit Server VM).
123+
Welcome to Scala 3.3.1 (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.11
127+
val res0: String = 2.13.10
128128
```
129129

130-
Note that Scala 3 offers
130+
Note that even the latest Scala 3 version might not use the very
131+
latest Scala 2 standard library, since the 3 and 2 release schedules
132+
aren't coordinated.
133+
134+
So how do you ask for the Scala 3 version number? Scala 3 offers
131135
`dotty.tools.dotc.config.Properties.versionNumberString`, but only if
132136
you have scala3-compiler on the classpath. So that works in the Scala 3
133137
REPL, but won't work in typical Scala 3 application code.

_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.11` or `3.3.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.12` 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/contributors/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ If you have written a library, you probably want it to be usable from several Sc
360360
Define the versions you want to support in the `crossScalaVersions` setting, in your `build.sbt` file:
361361

362362
~~~ scala
363-
crossScalaVersions := Seq("3.3.0", "2.13.11", "2.12.18")
363+
crossScalaVersions := Seq("3.3.0", "2.13.12", "2.12.18")
364364
scalaVersion := crossScalaVersions.value.head
365365
~~~
366366

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.1 LTS
1212
* [Library API](https://www.scala-lang.org/api/3.3.1/)
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/)
13+
* Scala 2.13.12
14+
* [Library API](https://www.scala-lang.org/api/2.13.12/)
15+
* [Compiler API](https://www.scala-lang.org/api/2.13.12/scala-compiler/scala/)
16+
* [Reflection API](https://www.scala-lang.org/api/2.13.12/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/)
@@ -84,6 +84,10 @@ https://scala-ci.typesafe.com/artifactory/scala-integration/org/scala-lang/
8484
* [Library API](https://www.scala-lang.org/api/3.0.1/)
8585
* Scala 3.0.0
8686
* [Library API](https://www.scala-lang.org/api/3.0.0/)
87+
* Scala 2.13.11
88+
* [Library API](https://www.scala-lang.org/api/2.13.11/)
89+
* [Compiler API](https://www.scala-lang.org/api/2.13.11/scala-compiler/scala/)
90+
* [Reflection API](https://www.scala-lang.org/api/2.13.11/scala-reflect/scala/reflect/)
8791
* Scala 2.13.10
8892
* [Library API](https://www.scala-lang.org/api/2.13.10/)
8993
* [Compiler API](https://www.scala-lang.org/api/2.13.10/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.11 org.scalameta::mdoc:2.3.3 -- \
4+
cs launch --scala-version 2.13.12 org.scalameta::mdoc:2.3.3 -- \
55
--in . \
66
--out /tmp/mdoc-out/ \
77
--classpath \
8-
$(cs fetch --scala-version 2.13.11 -p \
8+
$(cs fetch --scala-version 2.13.12 -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)