Skip to content

Commit e4fa32b

Browse files
authored
Merge branch 'main' into th_tour_traits
2 parents d57d5dd + b8e1b21 commit e4fa32b

File tree

137 files changed

+5579
-1079
lines changed

Some content is hidden

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

137 files changed

+5579
-1079
lines changed

Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,8 @@ GEM
251251
rb-fsevent (0.11.2)
252252
rb-inotify (0.10.1)
253253
ffi (~> 1.0)
254-
rexml (3.2.8)
255-
strscan (>= 3.0.9)
254+
rexml (3.3.6)
255+
strscan
256256
rouge (3.30.0)
257257
ruby2_keywords (0.0.5)
258258
rubyzip (2.3.2)
@@ -280,7 +280,7 @@ GEM
280280
unf_ext (0.0.9.1-x64-mingw-ucrt)
281281
unicode-display_width (1.8.0)
282282
uri (0.13.0)
283-
webrick (1.8.1)
283+
webrick (1.8.2)
284284
yell (2.2.2)
285285
zeitwerk (2.6.7)
286286

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.4.2
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/compiler-options.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -469,10 +469,6 @@
469469
schema:
470470
type: "Boolean"
471471
description: "Don't perform exhaustivity/unreachability analysis. Also, ignore @switch annotation."
472-
- option: "-Xno-uescape"
473-
schema:
474-
type: "Boolean"
475-
description: "Disable handling of \\u unicode escapes."
476472
- option: "-Xnojline"
477473
schema:
478474
type: "Boolean"

_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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
url: "http://scala-lang.org/community/"
2424
- title: Governance
2525
url: "http://scala-lang.org/community/index.html#governance"
26+
- title: Scala Ambassadors
27+
url: "http://scala-lang.org/ambassadors/"
2628
- title: Mailing Lists
2729
url: "http://scala-lang.org/community/index.html#mailing-lists"
2830
- title: Chat Rooms & More

_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)