Skip to content

Commit 53dd001

Browse files
committed
Merge remote-tracking branch 'origin/main' into dependabot/bundler/github-pages-232
2 parents 14d9d35 + ec9081c commit 53dd001

File tree

94 files changed

+1917
-896
lines changed

Some content is hidden

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

94 files changed

+1917
-896
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ GEM
281281
concurrent-ruby (~> 1.0)
282282
unicode-display_width (1.8.0)
283283
uri (0.13.0)
284-
webrick (1.8.1)
284+
webrick (1.8.2)
285285
yell (2.2.2)
286286
zeitwerk (2.6.7)
287287

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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ keywords:
1515
- Document
1616
- Guide
1717

18-
scala-version: 2.13.14
19-
scala-212-version: 2.12.19
20-
scala-3-version: 3.5.0
18+
scala-version: 2.13.15
19+
scala-212-version: 2.12.20
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/

_data/overviews.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,9 @@
161161
description: "A diverse and comprehensive set of libraries is important to any productive software ecosystem. While it is easy to develop and distribute Scala libraries, good library authorship goes beyond just writing code and publishing it. In this guide, we cover the important topic of Binary Compatibility."
162162
icon: puzzle-piece
163163
url: "core/binary-compatibility-for-library-authors.html"
164+
- title: Nightly Versions of Scala
165+
description: "We regularly publish 'nightlies' of both Scala 3 and Scala 2 so that users can preview and test the contents of upcoming releases. Here's how to find and use these versions."
166+
url: "core/nightlies.html"
164167

165168
- category: "Tools"
166169
description: "Reference material on core Scala tools like the Scala REPL and Scaladoc generation."

_data/setup-scala.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ linux-x86-64: curl -fL https://github.com/coursier/coursier/releases/latest/down
22
linux-arm64: curl -fL https://github.com/VirtusLab/coursier-m1/releases/latest/download/cs-aarch64-pc-linux.gz | gzip -d > cs && chmod +x cs && ./cs setup
33
macOS-x86-64: curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x86_64-apple-darwin.gz | gzip -d > cs && chmod +x cs && (xattr -d com.apple.quarantine cs || true) && ./cs setup
44
macOS-arm64: curl -fL https://github.com/VirtusLab/coursier-m1/releases/latest/download/cs-aarch64-apple-darwin.gz | gzip -d > cs && chmod +x cs && (xattr -d com.apple.quarantine cs || true) && ./cs setup
5-
macOS-brew: brew install coursier/formulas/coursier && cs setup
5+
macOS-brew: brew install coursier && coursier setup
66
windows-link: https://github.com/coursier/coursier/releases/latest/download/cs-x86_64-pc-win32.zip

_es/tour/automatic-closures.md

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

0 commit comments

Comments
 (0)