Skip to content

Commit 57efc0e

Browse files
committed
Merge branch 'main' into getting-started
# Conflicts: # _config.yml # api/all.md
2 parents 8e84db6 + 15b3f6f commit 57efc0e

File tree

78 files changed

+4837
-177
lines changed

Some content is hidden

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

78 files changed

+4837
-177
lines changed

Gemfile.lock

Lines changed: 2 additions & 2 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)

_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ keywords:
1515
- Document
1616
- Guide
1717

18-
scala-version: 2.13.14
19-
scala-212-version: 2.12.19
18+
scala-version: 2.13.15
19+
scala-212-version: 2.12.20
2020
scala-3-version: 3.5.1
2121

2222
collections:

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

_includes/_markdown/install-cask.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{% altDetails require-info-box 'Getting Cask' %}
2+
3+
{% tabs cask-install class=tabs-build-tool %}
4+
5+
{% tab 'Scala CLI' %}
6+
You can declare a dependency on Cask with the following `using` directive:
7+
```scala
8+
//> using dep "com.lihaoyi::cask::0.9.2"
9+
```
10+
{% endtab %}
11+
12+
{% tab 'sbt' %}
13+
In your `build.sbt`, you can add a dependency on Cask:
14+
```scala
15+
lazy val example = project.in(file("example"))
16+
.settings(
17+
scalaVersion := "3.4.2",
18+
libraryDependencies += "com.lihaoyi" %% "cask" % "0.9.2",
19+
fork := true
20+
)
21+
```
22+
{% endtab %}
23+
24+
{% tab 'Mill' %}
25+
In your `build.sc`, you can add a dependency on Cask:
26+
```scala
27+
object example extends RootModule with ScalaModule {
28+
def scalaVersion = "3.3.3"
29+
def ivyDeps = Agg(
30+
ivy"com.lihaoyi::cask::0.9.2"
31+
)
32+
}
33+
```
34+
{% endtab %}
35+
36+
{% endtabs %}
37+
{% endaltDetails %}

_includes/_markdown/install-munit.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ Alternatively, you can require just a specific version of MUnit:
1616
{% tab 'sbt' %}
1717
In your build.sbt file, you can add the dependency on toolkit-test:
1818
```scala
19-
lazy val example = project.in(file("example"))
19+
lazy val example = project.in(file("."))
2020
.settings(
2121
scalaVersion := "3.3.3",
2222
libraryDependencies += "org.scala-lang" %% "toolkit-test" % "0.1.7" % Test
2323
)
2424
```
25-
Here the `Test` configuration means that the dependency is only used by the source files in `example/src/test`.
25+
26+
Here the `Test` configuration means that the dependency is only used by the source files in `src/test`.
2627

2728
Alternatively, you can require just a specific version of MUnit:
2829
```scala

_includes/_markdown/install-os-lib.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Alternatively, you can require just a specific version of OS-Lib:
1515
{% tab 'sbt' %}
1616
In your `build.sbt`, you can add a dependency on the toolkit:
1717
```scala
18-
lazy val example = project.in(file("example"))
18+
lazy val example = project.in(file("."))
1919
.settings(
2020
scalaVersion := "3.3.3",
2121
libraryDependencies += "org.scala-lang" %% "toolkit" % "0.1.7"

_includes/_markdown/install-sttp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Alternatively, you can require just a specific version of sttp:
1515
{% tab 'sbt' %}
1616
In your build.sbt file, you can add a dependency on the Toolkit:
1717
```scala
18-
lazy val example = project.in(file("example"))
18+
lazy val example = project.in(file("."))
1919
.settings(
2020
scalaVersion := "3.3.3",
2121
libraryDependencies += "org.scala-lang" %% "toolkit" % "0.1.7"

0 commit comments

Comments
 (0)