Skip to content

Commit 28a1f10

Browse files
committed
Merge remote-tracking branch 'origin/main' into dependabot/bundler/webrick-1.8.2
2 parents 07f6c5b + 905ed27 commit 28a1f10

File tree

68 files changed

+1443
-663
lines changed

Some content is hidden

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

68 files changed

+1443
-663
lines changed

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: 2 additions & 2 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
18+
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:

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

_fr/tour/automatic-closures.md

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

_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 %}
File renamed without changes.

_ja/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ sections:
1414
- title: "入門"
1515
description: "あなたのコンピューターに Scala をインストールして、Scala コードを書きはじめよう!"
1616
icon: "fa fa-rocket"
17-
link: /ja/getting-started/index.html
17+
link: /ja/getting-started/install-scala.html
1818
- title: "Scala ツアー"
1919
description: "コア言語機能をひと口大で紹介"
2020
icon: "fa fa-flag"

_ja/tour/automatic-closures.md

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

_ko/tour/annotations.md

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

99
next-page: packages-and-imports
10-
previous-page: automatic-closures
10+
previous-page: operators
1111
---
1212

1313
어노테이션은 메타 정보와 정의 내용을 연결해준다.

_ko/tour/automatic-closures.md

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

_ko/tour/operators.md

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

9-
next-page: automatic-closures
9+
next-page: annotations
1010
previous-page: type-inference
1111
---
1212

0 commit comments

Comments
 (0)