Skip to content

Commit b4ed47b

Browse files
committed
Merge remote-tracking branch 'origin/main' into jdk-compat-scala-3-lts
2 parents 901319f + 0dcb1ab commit b4ed47b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+511
-702
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
- name: Set up Ruby
99
uses: ruby/setup-ruby@v1
1010
with:
11-
ruby-version: 3.0.5
11+
ruby-version: 3.1.6
1212
bundler-cache: true
1313
- name: Set up coursier
1414
uses: coursier/[email protected]

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.0.5
1+
FROM ruby:3.1.6
22

33
RUN gem install bundler:2.4.21
44

Gemfile.lock

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,56 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.1.3)
4+
activesupport (7.2.1)
55
base64
66
bigdecimal
7-
concurrent-ruby (~> 1.0, >= 1.0.2)
7+
concurrent-ruby (~> 1.0, >= 1.3.1)
88
connection_pool (>= 2.2.5)
99
drb
1010
i18n (>= 1.6, < 2)
11+
logger (>= 1.4.2)
1112
minitest (>= 5.1)
12-
mutex_m
13-
tzinfo (~> 2.0)
14-
addressable (2.8.6)
15-
public_suffix (>= 2.0.2, < 6.0)
13+
securerandom (>= 0.3)
14+
tzinfo (~> 2.0, >= 2.0.5)
15+
addressable (2.8.7)
16+
public_suffix (>= 2.0.2, < 7.0)
1617
base64 (0.2.0)
17-
bigdecimal (3.1.6)
18+
bigdecimal (3.1.8)
1819
coffee-script (2.4.1)
1920
coffee-script-source
2021
execjs
2122
coffee-script-source (1.12.2)
2223
colorator (1.1.0)
2324
commonmarker (0.23.10)
24-
concurrent-ruby (1.2.3)
25+
concurrent-ruby (1.3.4)
2526
connection_pool (2.4.1)
26-
dnsruby (1.70.0)
27+
csv (3.3.0)
28+
dnsruby (1.72.2)
2729
simpleidn (~> 0.2.1)
28-
drb (2.2.0)
29-
ruby2_keywords
30+
drb (2.2.1)
3031
em-websocket (0.5.3)
3132
eventmachine (>= 0.12.9)
3233
http_parser.rb (~> 0)
3334
ethon (0.16.0)
3435
ffi (>= 1.15.0)
3536
eventmachine (1.2.7)
3637
execjs (2.9.1)
37-
faraday (2.9.0)
38+
faraday (2.10.1)
3839
faraday-net_http (>= 2.0, < 3.2)
39-
faraday-net_http (3.1.0)
40+
logger
41+
faraday-net_http (3.1.1)
4042
net-http
41-
ffi (1.16.3)
42-
ffi (1.16.3-x64-mingw-ucrt)
43+
ffi (1.17.0-arm64-darwin)
44+
ffi (1.17.0-x64-mingw-ucrt)
45+
ffi (1.17.0-x86_64-linux-gnu)
4346
forwardable-extended (2.6.0)
4447
gemoji (4.1.0)
45-
github-pages (231)
48+
github-pages (232)
4649
github-pages-health-check (= 1.18.2)
47-
jekyll (= 3.9.5)
50+
jekyll (= 3.10.0)
4851
jekyll-avatar (= 0.8.0)
4952
jekyll-coffeescript (= 1.2.2)
50-
jekyll-commonmark-ghpages (= 0.4.0)
53+
jekyll-commonmark-ghpages (= 0.5.1)
5154
jekyll-default-layout (= 0.1.5)
5255
jekyll-feed (= 0.17.0)
5356
jekyll-gist (= 1.5.0)
@@ -84,9 +87,10 @@ GEM
8487
liquid (= 4.0.4)
8588
mercenary (~> 0.3)
8689
minima (= 2.5.1)
87-
nokogiri (>= 1.13.6, < 2.0)
90+
nokogiri (>= 1.16.2, < 2.0)
8891
rouge (= 3.30.0)
8992
terminal-table (~> 1.4)
93+
webrick (~> 1.8)
9094
github-pages-health-check (1.18.2)
9195
addressable (~> 2.3)
9296
dnsruby (~> 1.60)
@@ -106,11 +110,12 @@ GEM
106110
yell (~> 2.0)
107111
zeitwerk (~> 2.5)
108112
http_parser.rb (0.8.0)
109-
i18n (1.14.1)
113+
i18n (1.14.5)
110114
concurrent-ruby (~> 1.0)
111-
jekyll (3.9.5)
115+
jekyll (3.10.0)
112116
addressable (~> 2.4)
113117
colorator (~> 1.0)
118+
csv (~> 3.0)
114119
em-websocket (~> 0.5)
115120
i18n (>= 0.7, < 2)
116121
jekyll-sass-converter (~> 1.0)
@@ -121,16 +126,17 @@ GEM
121126
pathutil (~> 0.9)
122127
rouge (>= 1.7, < 4)
123128
safe_yaml (~> 1.0)
129+
webrick (>= 1.0)
124130
jekyll-avatar (0.8.0)
125131
jekyll (>= 3.0, < 5.0)
126132
jekyll-coffeescript (1.2.2)
127133
coffee-script (~> 2.2)
128134
coffee-script-source (~> 1.12)
129135
jekyll-commonmark (1.4.0)
130136
commonmarker (~> 0.22)
131-
jekyll-commonmark-ghpages (0.4.0)
132-
commonmarker (~> 0.23.7)
133-
jekyll (~> 3.9.0)
137+
jekyll-commonmark-ghpages (0.5.1)
138+
commonmarker (>= 0.23.7, < 1.1.0)
139+
jekyll (>= 3.9, < 4.0)
134140
jekyll-commonmark (~> 1.4.0)
135141
rouge (>= 2.0, < 5.0)
136142
jekyll-default-layout (0.1.5)
@@ -221,40 +227,39 @@ GEM
221227
kramdown-parser-gfm (1.1.0)
222228
kramdown (~> 2.0)
223229
liquid (4.0.4)
224-
listen (3.8.0)
230+
listen (3.9.0)
225231
rb-fsevent (~> 0.10, >= 0.10.3)
226232
rb-inotify (~> 0.9, >= 0.9.10)
233+
logger (1.6.0)
227234
mercenary (0.3.6)
228235
minima (2.5.1)
229236
jekyll (>= 3.5, < 5.0)
230237
jekyll-feed (~> 0.9)
231238
jekyll-seo-tag (~> 2.1)
232-
minitest (5.22.2)
233-
mutex_m (0.2.0)
239+
minitest (5.25.1)
234240
net-http (0.4.1)
235241
uri
236-
nokogiri (1.16.5-arm64-darwin)
242+
nokogiri (1.16.7-arm64-darwin)
237243
racc (~> 1.4)
238-
nokogiri (1.16.5-x64-mingw-ucrt)
244+
nokogiri (1.16.7-x64-mingw-ucrt)
239245
racc (~> 1.4)
240-
nokogiri (1.16.5-x86_64-linux)
246+
nokogiri (1.16.7-x86_64-linux)
241247
racc (~> 1.4)
242248
octokit (4.25.1)
243249
faraday (>= 1, < 3)
244250
sawyer (~> 0.9)
245251
parallel (1.22.1)
246252
pathutil (0.16.2)
247253
forwardable-extended (~> 2.6)
248-
public_suffix (5.0.4)
249-
racc (1.7.3)
254+
public_suffix (5.1.1)
255+
racc (1.8.1)
250256
rainbow (3.1.1)
251257
rb-fsevent (0.11.2)
252-
rb-inotify (0.10.1)
258+
rb-inotify (0.11.1)
253259
ffi (~> 1.0)
254260
rexml (3.3.6)
255261
strscan
256262
rouge (3.30.0)
257-
ruby2_keywords (0.0.5)
258263
rubyzip (2.3.2)
259264
safe_yaml (1.0.5)
260265
sass (3.7.4)
@@ -265,22 +270,18 @@ GEM
265270
sawyer (0.9.2)
266271
addressable (>= 2.3.5)
267272
faraday (>= 0.17.3, < 3)
268-
simpleidn (0.2.1)
269-
unf (~> 0.1.4)
273+
securerandom (0.3.1)
274+
simpleidn (0.2.3)
270275
strscan (3.1.0)
271276
terminal-table (1.8.0)
272277
unicode-display_width (~> 1.1, >= 1.1.1)
273278
typhoeus (1.4.1)
274279
ethon (>= 0.9.0)
275280
tzinfo (2.0.6)
276281
concurrent-ruby (~> 1.0)
277-
unf (0.1.4)
278-
unf_ext
279-
unf_ext (0.0.9.1)
280-
unf_ext (0.0.9.1-x64-mingw-ucrt)
281282
unicode-display_width (1.8.0)
282283
uri (0.13.0)
283-
webrick (1.8.1)
284+
webrick (1.9.0)
284285
yell (2.2.2)
285286
zeitwerk (2.6.7)
286287

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Scala Documentation #
22

3-
[![Build Status](https://ci.scala-lang.org/api/badges/scala/docs.scala-lang/status.svg)](https://platform-ci.scala-lang.org/scala/docs.scala-lang)
3+
[![Build Status](https://github.com/scala/docs.scala-lang/actions/workflows/build.yml/badge.svg)](https://github.com/scala/docs.scala-lang/actions/workflows/build.yml?query=branch%3Amain)
44

55
This repository contains the source for the Scala documentation website, as well as the source for "Scala Improvement Process" (SIP) documents.
66

_ba/tour/automatic-closures.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ keywords:
1717

1818
scala-version: 2.13.15
1919
scala-212-version: 2.12.20
20-
scala-3-version: 3.5.1
20+
scala-3-version: 3.5.2
2121

2222
collections:
2323
style:

_data/doc-nav-header.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
- title: Getting Started
2-
url: "/getting-started/index.html"
2+
url: "#"
3+
submenu:
4+
- title: Install Scala
5+
url: "/getting-started/install-scala.html"
6+
- title: Scala IDEs
7+
url: "/getting-started/scala-ides.html"
38
- title: Scala 3
49
url: "#"
510
submenu:

_data/footer.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@
2121
links:
2222
- title: Community
2323
url: "http://scala-lang.org/community/"
24-
- title: Governance
25-
url: "http://scala-lang.org/community/index.html#governance"
2624
- title: Scala Ambassadors
2725
url: "http://scala-lang.org/ambassadors/"
28-
- title: Mailing Lists
29-
url: "http://scala-lang.org/community/index.html#mailing-lists"
30-
- title: Chat Rooms & More
26+
- title: Forums
27+
url: "http://scala-lang.org/community/index.html#forums"
28+
- title: Chat
3129
url: "http://scala-lang.org/community/index.html#chat-rooms"
3230
- title: Libraries and Tools
3331
url: "http://scala-lang.org/community/index.html#community-libraries-and-tools"
@@ -43,16 +41,26 @@
4341
- title: Scala
4442
class: scala
4543
links:
44+
- title: Governance
45+
url: "http://scala-lang.org/governance/"
4646
- title: Blog
4747
url: "http://scala-lang.org/blog/"
4848
- title: Code of Conduct
4949
url: "http://scala-lang.org/conduct/"
5050
- title: License
5151
url: "http://scala-lang.org/license/"
52+
- title: Security Policy
53+
url: "http://scala-lang.org/security/"
5254
- title: Social
5355
class: social
5456
links:
5557
- title: GitHub
5658
url: "https://github.com/scala/scala"
59+
- title: Mastodon
60+
url: https://fosstodon.org/@scala_lang
5761
- title: Twitter
5862
url: "https://twitter.com/scala_lang"
63+
- title: Discord
64+
url: "https://discord.com/invite/scala"
65+
- title: LinkedIn
66+
url: "https://www.linkedin.com/company/scala-center/"

_data/nav-header.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@
88
url: https://index.scala-lang.org
99
- title: Community
1010
url: https://www.scala-lang.org/community/
11+
- title: Governance
12+
url: https://www.scala-lang.org/governance/
1113
- title: Blog
1214
url: https://www.scala-lang.org/blog/

_es/tour/automatic-closures.md

Lines changed: 0 additions & 65 deletions
This file was deleted.

_es/tour/multiple-parameter-lists.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ partof: scala-tour
66
num: 15
77
language: es
88

9-
next-page: automatic-closures
9+
next-page: operators
1010
previous-page: nested-functions
1111
---
1212

_es/tour/operators.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ num: 17
77
language: es
88

99
next-page: higher-order-functions
10-
previous-page: automatic-closures
10+
previous-page: multiple-parameter-lists
1111
---
1212

1313
En Scala, cualquier método el cual reciba un solo parámetro puede ser usado como un *operador de infijo (infix)*. Aquí se muestra la definición de la clase `MyBool`, la cual define tres métodos `and`, `or`, y `negate`.

_es/tour/tour-of-scala.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ El [mecanismo de inferencia de tipos locales](type-inference.html) se encarga de
3737

3838
En la práctica, el desarrollo de aplicaciones específicas para un dominio generalmente requiere de "Lenguajes de dominio específico" (DSL). Scala provee una única combinación de mecanismos del lenguaje que simplifican la creación de construcciones propias del lenguaje en forma de bibliotecas:
3939
* cualquier método puede ser usado como un operador de [infijo o postfijo](operators.html)
40-
* [las closures son construidas automáticamente dependiendo del tipo esperado](automatic-closures.html) (tipos objetivo).
4140

4241
El uso conjunto de ambas características facilita la definición de nuevas sentencias sin tener que extender la sintaxis y sin usar facciones de meta-programación como tipo macros.
4342

File renamed without changes.

0 commit comments

Comments
 (0)