Skip to content

Commit 72ef1de

Browse files
authored
Merge branch 'scala:main' into th_tour_traits
2 parents 8bc8663 + 4cace3b commit 72ef1de

File tree

6 files changed

+18
-20
lines changed

6 files changed

+18
-20
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build
22
on: [push, pull_request]
33
jobs:
44
build:
5-
runs-on: ubuntu-20.04
5+
runs-on: ubuntu-22.04
66
steps:
77
- uses: actions/checkout@v4
88
- name: Set up Ruby

Gemfile.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -264,11 +264,11 @@ GEM
264264
minitest (5.25.4)
265265
net-http (0.6.0)
266266
uri
267-
nokogiri (1.18.3-arm64-darwin)
267+
nokogiri (1.18.8-arm64-darwin)
268268
racc (~> 1.4)
269-
nokogiri (1.18.3-x64-mingw-ucrt)
269+
nokogiri (1.18.8-x64-mingw-ucrt)
270270
racc (~> 1.4)
271-
nokogiri (1.18.3-x86_64-linux-gnu)
271+
nokogiri (1.18.8-x86_64-linux-gnu)
272272
racc (~> 1.4)
273273
octokit (4.25.1)
274274
faraday (>= 1, < 3)

_overviews/FAQ/index.md

+8-10
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,15 @@ reasons for wanting to learn Scala.
4444
Don't sweat the decision too much. You can't go far wrong either
4545
way. It isn't that hard to switch later, in either direction.
4646

47-
Scala 2 remains a common and reasonable choice. Most Scala jobs are
48-
still Scala 2 jobs. Scala 2 also has a somewhat bigger library
49-
ecosystem, somewhat better tooling support, and somewhat wider
50-
availability of learning materials.
51-
52-
That said, these gaps are getting narrower every month.
53-
Plenty of books are available, a rich library ecosystem already
54-
exists, and there are more and more jobs using Scala 3. You should strongly
55-
consider learning Scala 3. It's still fairly new, released in 2021.
56-
But it's the future, and it's the best version for
47+
Regardless, you should choose Scala 3 unless you have a specific reason
48+
to need 2. Scala 3 is the future, and it's the best version for
5749
falling in love with the language and everything it has to offer.
50+
Scala 3 has plenty of books, plenty of libraries, and high quality
51+
tooling.
52+
53+
That said, many Scala jobs are still Scala 2 jobs. In most cases, the
54+
cause of that is simply inertia, especially at large shops. (But it can
55+
sometimes be due to availability of specific libraries.)
5856

5957
### Where are Scala jobs advertised?
6058

_overviews/scala3-book/tools-sbt.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Create a file named _build.properties_ in the directory `project`, with
4848
the following content:
4949

5050
```text
51-
sbt.version=1.6.1
51+
sbt.version=1.10.11
5252
```
5353

5454
Then create a file named _build.sbt_ in the project root directory that contains this line:
@@ -358,7 +358,7 @@ Next, create a _build.properties_ file in the _project/_ subdirectory of your pr
358358
with this line:
359359
360360
```text
361-
sbt.version=1.5.4
361+
sbt.version=1.10.11
362362
```
363363
364364
Next, create a _build.sbt_ file in the root directory of your project with these contents:

_ru/scala3/book/tools-sbt.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ $ mkdir project
4848
Создайте файл с именем _build.properties_ в каталоге `project` со следующим содержимым:
4949

5050
```text
51-
sbt.version=1.6.1
51+
sbt.version=1.10.11
5252
```
5353

5454
Затем создайте файл с именем _build.sbt_ в корневом каталоге проекта, содержащий следующую строку:
@@ -354,7 +354,7 @@ $ mkdir project
354354
Затем создаем файл _build.properties_ в подкаталоге _project/_ проекта с такой строкой:
355355

356356
```text
357-
sbt.version=1.5.4
357+
sbt.version=1.10.11
358358
```
359359

360360
Создаем файл _build.sbt_ в корневом каталоге проекта со следующим содержимым:

_zh-cn/overviews/scala3-book/tools-sbt.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ $ mkdir project
5050
以下内容:
5151

5252
```text
53-
sbt.version=1.6.1
53+
sbt.version=1.10.11
5454
```
5555

5656
然后在包含此行的项目根目录中创建一个名为 _build.sbt_ 的文件:
@@ -350,7 +350,7 @@ $ mkdir project
350350
接下来,把下面这行代码用于在项目的 _project/_ 子目录中创建一个 _build.properties_ 文件:
351351
352352
```text
353-
sbt.version=1.5.4
353+
sbt.version=1.10.11
354354
```
355355
356356
接下来,在项目的根目录中创建一个 _build.sbt_ 文件,其中包含以下内容:

0 commit comments

Comments
 (0)