Merge branch 'scala:main' into zh-cn/overviews/scala3-book/scala-tools

scala · Nov 18, 2023 · 1f99707 · 1f99707
2 parents 168bfc1 + 5f6168e
commit 1f99707
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 20 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ruby:3.0.5
 
-RUN gem install bundler:2.4.7
+RUN gem install bundler:2.4.21
 
 WORKDIR /srv/jekyll
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -268,6 +268,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-23
   x64-mingw-ucrt
   x86_64-linux
 
@@ -277,4 +278,4 @@ DEPENDENCIES
   webrick
 
 BUNDLED WITH
-   2.4.7
+   2.4.21
diff --git a/_books/3-scala-for-the-impatient.md b/_books/3-scala-for-the-impatient.md
@@ -0,0 +1,23 @@
+---
+title: "Scala for the Impatient"
+link: https://horstmann.com/scala/
+image: /resources/img/books/scala_for_the_impatient.jpg
+status: Updated for Scala 3
+authors: ["Cay Horstmann"]
+publisher: Addison-Wesley Professional
+publisherLink: https://www.oreilly.com/publisher/addison-wesley-professional/
+---
+
+What you get:
+
+* Up to date coverage of Scala 3
+* A rapid introduction to Scala for programmers who are competent in another language such as Java, C#, Python, JavaScript, or C++
+* Blog-length chunks of information that you can digest quickly
+* An organization that you'll find useful as a quick reference
+
+What you don't get:
+
+* An introduction into programming or object-oriented design
+* Religion about the superiority of one paradigm or another
+* Cute or academic examples
+* Mind-numbing details about syntax minutiae
diff --git a/_books/3-hands-on-scala.md → _books/4-hands-on-scala.md b/_books/3-hands-on-scala.md → _books/4-hands-on-scala.md
diff --git a/_books/5-get-programming.bd → _books/5-get-programming.md b/_books/5-get-programming.bd → _books/5-get-programming.md
diff --git a/_books/4-functional-programming-in-scala.md → _books/7-functional-programming-in-scala.md b/_books/4-functional-programming-in-scala.md → _books/7-functional-programming-in-scala.md
@@ -1,15 +1,13 @@
 ---
 title: "Functional Programming in Scala"
-link: https://www.manning.com/books/functional-programming-in-scala
-image: /resources/img/books/FPiS_93x116.png
-status: Covers Scala 2; Scala 3 version in early-access
-authors: ["Paul Chiusano", "Rúnar Bjarnason"]
+link: https://www.manning.com/books/functional-programming-in-scala-second-edition
+image: /resources/img/books/FPiS_93x116.jpg
+status: Updated for Scala 3
+authors: ["Michael Pilquist", "Paul Chiusano", "Rúnar Bjarnason"]
 publisher: Manning
 publisherLink: https://www.manning.com/
 ---
 
 "Functional programming (FP) is a style of software development emphasizing functions that don't depend on program state... Functional Programming in Scala is a serious tutorial for programmers looking to learn FP and apply it to the everyday business of coding. The book guides readers from basic techniques to advanced topics in a logical, concise, and clear progression. In it, you'll find concrete examples and exercises that open up the world of functional programming."
 
-Foreword by Martin Odersky.
-
-The [Scala 3 version](https://www.manning.com/books/functional-programming-in-scala-second-edition), co-authored by Michael Pilquist, is in early-access as of February 2022.
+Forewords by Daniel Spiewak and Martin Odersky.
diff --git a/_overviews/compiler-options/optimizer.md b/_overviews/compiler-options/optimizer.md
@@ -28,7 +28,7 @@ The Scala compiler has included an inliner since version 2.0. Closure eliminatio
 
 The optimizer was re-written for Scala 2.12 to become more reliable and powerful – and to side-step the spelling issue by calling the new flag `-opt`. This post describes how to use the optimizer in Scala 2.12 and 2.13: what it does, how it works, and what are its limitations.
 
-The options were simplified for 2.13.9, as described here. The [earlier version](https://www.lightbend.com/blog/scala-inliner-optimizer) of this article uses the traditional forms, which are still supported.
+The options were simplified for 2.13.9. This page uses the simplified forms.
 
 ## Motivation
 

diff --git a/_sips/sips/proper-specification-for-match-types.md b/_sips/sips/proper-specification-for-match-types.md
diff --git a/_tour/variances.md b/_tour/variances.md
@@ -180,7 +180,7 @@ catSerializer.serialize(Cat("Felix"))
 abstract class Serializer[-A]:
   def serialize(a: A): String
 
-val animalSerializer: Serializer[Animal] = Serializer[Animal]():
+val animalSerializer: Serializer[Animal] = new Serializer[Animal]():
   def serialize(animal: Animal): String = s"""{ "name": "${animal.name}" }"""
 
 val catSerializer: Serializer[Cat] = animalSerializer

diff --git a/books.md b/books.md
@@ -5,8 +5,8 @@ redirect_from:
   - /documentation/books.html
 ---
 
-More and more books being published about Scala every year. Here, you can find
-just a small selection of the many available titles.
+More books about Scala are published every year. This is
+only a selection of the available titles.
 
 <br>
 

diff --git a/resources/img/books/FPiS_93x116.jpg b/resources/img/books/FPiS_93x116.jpg
diff --git a/resources/img/books/FPiS_93x116.png b/resources/img/books/FPiS_93x116.png
diff --git a/resources/img/books/scala_for_the_impatient.jpg b/resources/img/books/scala_for_the_impatient.jpg
diff --git a/resources/img/books/scala_for_the_impatient.png b/resources/img/books/scala_for_the_impatient.png