Merge branch 'scala:main' into main

Author: ac2epsilon

.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.5.8
+          ruby-version: 2.6.9
           bundler-cache: true
       - name: Set up coursier
         uses: coursier/[email protected]

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5
+FROM ruby:2.6
 
 RUN gem install bundler jekyll
 

Gemfile.lock

@@ -54,17 +54,17 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.6.1)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    mini_portile2 (2.8.0)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)
     parallel (1.19.2)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rainbow (3.0.0)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)

_books/1-programming-in-scala-5th.md

@@ -2,11 +2,10 @@
 title: "Programming in Scala, 5th ed"
 link: https://www.artima.com/shop/programming_in_scala_5ed
 image: /resources/img/books/ProgrammingInScala.png
-status: Updated for Scala 3.0
+status: Updated for Scala 3
 authors: ["Martin Odersky", "Lex Spoon", "Bill Venners"]
-publisher: 
+publisher: Artima
+publisherLink: https://www.artima.com/books
 ---
 
-(First edition [available for free online reading](https://www.artima.com/pins1ed/))
-
 This book is co-authored by the language's designer, Martin Odersky. It provides depth and clarity on the diverse features of the language. The book provides both an authoritative reference for Scala and a systematic tutorial covering all the features in the language. Once you are familiar with the basics of Scala you will appreciate having this source of invaluable examples and precise explanations of Scala on hand. The book is available from [Artima](https://www.artima.com/shop/programming_in_scala_5ed). Award winning book - [Jolt Productivity award](https://www.drdobbs.com/joltawards/232601431) for Technical Books.

_books/5-functional-programming-in-scala.md renamed to _books/4-functional-programming-in-scala.md

@@ -2,10 +2,14 @@
 title: "Functional Programming in Scala"
 link: https://www.manning.com/books/functional-programming-in-scala
 image: /resources/img/books/FPiS_93x116.png
-status: Available now
+status: Covers Scala 2; Scala 3 version in early-access
 authors: ["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." 
+"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.

_books/5-get-programming.bd

@@ -0,0 +1,11 @@
+---
+title: "Get Programming with Scala"
+link: https://www.manning.com/books/get-programming-with-scala
+image: /resources/img/books/get-programming-book.png
+status: Covers Scala 2 and 3
+authors: ["Daniela Sfregola"]
+publisher: Manning
+publisherLink: https://www.manning.com/
+---
+
+"The perfect starting point for your journey into Scala and functional programming. Scala is a multi-style programming language for the JVM that supports both object-oriented and functional programming. Master Scala, and you'll be well-equipped to match your programming approach to the type of problem you're dealing with. Packed with examples and exercises, _Get Programming with Scala_ is the perfect starting point for developers with some OO knowledge who want to learn Scala and pick up a few FP skills along the way."

_books/4-creative-scala.md renamed to _books/6-creative-scala.md

@@ -17,7 +17,7 @@ keywords:
 
 scala-version: 2.13.8
 scala-212-version: 2.12.15
-scala-3-version: 3.1.0
+scala-3-version: 3.1.1
 
 collections:
   style:

_books/6-scala-puzzlers.bd

@@ -259,6 +259,11 @@
       icon: cog
       url: "compiler-options/errors.html"
       description: "A new engine for more user-friendly error messages, printing chains of dependent implicits and colored found/required type diffs."
+    - title: Optimizer
+      by: Lukas Rytz and Andrew Marki
+      icon: cog
+      url: "compiler-options/optimizer.html"
+      description: "The compiler can perform various optimizations."
 
 
 - category: Legacy

_config.yml

@@ -14,7 +14,7 @@ Scala をインストールすると、コンパイラやビルドツールな
 
 ### Scala インストーラーを使う（推奨）
 
-Scala のインストーラーは[Coursier](https://get-coursier.io/docs/cli-overview)というツールで、コマンドは`cs`です。このツールを使うと、JVM と標準 Scala ツールがシステムにインストールされます。  
+Scala のインストーラーは[Coursier](https://get-coursier.io/docs/cli-overview)というツールで、コマンドは`cs`です。このツールを使うと、JVM と標準 Scala ツールがシステムにインストールされます。
 以下の手順でお使いのシステムにインストールしてください。
 
 <div class="main-download">
@@ -44,8 +44,8 @@ Scala のインストーラーは[Coursier](https://get-coursier.io/docs/cli-ove
 
 ### 手動でのインストール
 
-Scala プロジェクトのコンパイル、実行、テスト、パッケージ化に必要なツールは Java と sbt の2つだけです。  
-Java のバージョンは8または11です。  
+Scala プロジェクトのコンパイル、実行、テスト、パッケージ化に必要なツールは Java と sbt の2つだけです。
+Java のバージョンは8または11です。
 これらを手動でインストールするには:
 
 1. Java 8または11がインストールされていない場合は、[Oracle Java 8](https://www.oracle.com/java/technologies/javase-jdk8-downloads.html)、[Oracle Java 11](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html)、または[AdoptOpenJDK 8/11](https://adoptopenjdk.net/)からJavaをダウンロードしてください。Scala と Java の互換性の詳細については、[JDK Compatibility](/overviews/jdk-compatibility/overview.html)を参照してください。
@@ -144,13 +144,13 @@ Scala について日本語で質問したい場合、Twitterでつぶやくと
 
 <!-- Hidden elements whose content are used to provide OS-specific download instructions.
  -- This is handled in `resources/js/functions.js`.
- --> 
+ -->
 <div style="display:none" id="stepOne-linux">
-       <code class="hljs">$ curl -fLo cs https://git.io/coursier-cli-linux && chmod +x cs && ./cs setup </code> <br>
+       <code class="hljs">$ curl -fL https://github.com/coursier/launchers/raw/master/cs-x86_64-pc-linux.gz | gzip -d > cs && chmod +x cs && ./cs setup</code> <br>
 </div>
 
 <div style="display:none" id="stepOne-unix">
-    <p>Follow <a href="https://get-coursier.io/docs/cli-installation" target="_blank">the instructions to install the <code>cs</code> launcher</a> then run:</p>
+    <p><a href="https://get-coursier.io/docs/cli-installation" target="_blank">手順に従って <code>cs</code> ランチャーをインストール</a>し、その次に以下を実行します。</p>
     <p><code>$ ./cs setup</code></p>
 </div>
 
@@ -160,10 +160,10 @@ Scala について日本語で質問したい場合、Twitterでつぶやくと
     </div>
     <p>または、Homebrewを使用しない場合は</p>
     <div class="highlight">
-        <code class="hljs">$ curl -fLo cs https://git.io/coursier-cli-macos && chmod +x cs &&  (xattr -d com.apple.quarantine cs || true) && ./cs setup</code> <br>
+        <code class="hljs">$ curl -fL https://github.com/coursier/launchers/raw/master/cs-x86_64-apple-darwin.gz | gzip -d > cs && chmod +x cs &&  (xattr -d com.apple.quarantine cs || true) && ./cs setup</code> <br>
     </div>
 </div>
 
 <div style="display:none" id="stepOne-windows">
-    <p><a href="https://git.io/coursier-cli-windows-exe">the Scala installer for Windows</a>を、ダウンロードして実行すてください。</p>
+    <p><a href="https://github.com/coursier/launchers/raw/master/cs-x86_64-pc-win32.zip">the Scala installer for Windows</a>を、ダウンロードして実行してください。</p>
 </div>

_data/overviews.yml

@@ -34,20 +34,24 @@ Along with managing JVMs, `cs setup` also installs useful command-line tools:
 - The [sbt](https://www.scala-sbt.org/) build tool
 - [Ammonite](https://ammonite.io/), an enhanced REPL
 - [scalafmt](https://scalameta.org/scalafmt/), the Scala code formatter
-- `scalac` (the Scala 2 compiler)
-- `scala` (the Scala 2 REPL and script runner).
+- `scalac` (the Scala compiler)
+- `scala` (the Scala REPL and script runner).
 
 For more information about `cs`, read
 [coursier-cli documentation](https://get-coursier.io/docs/cli-overview).
 
-> Currently, `cs setup` installs the Scala 2 compiler and runner (the `scalac` and
-> `scala` commands, respectively). This is usually not an issue because most projects
-> use a build tool that works with both Scala 2 and Scala 3.
-> Nevertheless, you can install the Scala 3 compiler and runner as command-line tools
-> by running the following additional commands:
+> `cs setup` installs the Scala 3 compiler and runner by default (the `scalac` and
+> `scala` commands, respectively). Whether you intend to use Scala 2 or 3,
+> this is usually not an issue because most projects use a build tool that will
+> use the correct version of Scala irrespective of the one installed "globally".
+> Nevertheless, you can always launch a specific version of Scala using
 > ```
-> $ cs install scala3-compiler
-> $ cs install scala3
+> $ cs launch scala:{{ site.scala-version }}
+> $ cs launch scalac:{{ site.scala-version }}
+> ```
+> If you prefer Scala 2 to be run by default, you can force that version to be installed with:
+> ```
+> $ cs install scala:{{ site.scala-version }} scalac:{{ site.scala-version }}
 > ```
 
 ### ...or manually
@@ -164,9 +168,9 @@ There are a multitude of mailing lists and real-time chat rooms in case you want
 
 <!-- Hidden elements whose content are used to provide OS-specific download instructions.
  -- This is handled in `resources/js/functions.js`.
- --> 
+ -->
 <div style="display:none" id="stepOne-linux">
-       <code class="hljs">$ curl -fLo cs https://git.io/coursier-cli-linux && chmod +x cs && ./cs setup </code> <br>
+       <code class="hljs">$ curl -fL https://github.com/coursier/launchers/raw/master/cs-x86_64-pc-linux.gz | gzip -d > cs && chmod +x cs && ./cs setup</code><br>
 </div>
 
 <div style="display:none" id="stepOne-unix">
@@ -180,10 +184,10 @@ There are a multitude of mailing lists and real-time chat rooms in case you want
     </div>
     <p>Alternatively, if you don't use Homebrew</p>
     <div class="highlight">
-        <code class="hljs">$ curl -fLo cs https://git.io/coursier-cli-macos && chmod +x cs &&  (xattr -d com.apple.quarantine cs || true) && ./cs setup</code> <br>
+        <code class="hljs">$ curl -fL https://github.com/coursier/launchers/raw/master/cs-x86_64-apple-darwin.gz | gzip -d > cs && chmod +x cs &&  (xattr -d com.apple.quarantine cs || true) && ./cs setup</code> <br>
     </div>
 </div>
 
 <div style="display:none" id="stepOne-windows">
-    <p>Download and execute <a href="https://git.io/coursier-cli-windows-exe">the Scala installer for Windows</a> based on coursier</p>
+    <p>Download and execute <a href="https://github.com/coursier/launchers/raw/master/cs-x86_64-pc-win32.zip">the Scala installer for Windows</a> based on coursier</p>
 </div>

_includes/_ja/getting-started.md

@@ -578,7 +578,7 @@ definendo la classe `Date` come segue:
       def year = y
       def month = m
       def day = d
-      override def toString(): String = year + "-" + month + "-" + day
+      override def toString(): String = s"$year-$month-$day"
 
 La parte importante qui è la dichiarazione `extends Ord` che segue il nome
 della classe e dei parametri. Dichiara che la classe `Date` eredita il

_includes/getting-started.md

@@ -32,7 +32,7 @@ def squareOf(x: Int) = x * x
 def fac(n: Int) = if (n == 0) 1 else n * fac(n - 1)
 ```
 
-[ポリモーフフィックメソッド](polymorphic-methods.html)が呼ばれる時や[ジェネリッククラス](generic-classes.html) がインスタンス化される場合も型パラメータの指定は強制ではありません。Scalaコンパイラは文脈あるいはメソッドやコンストラクタの実際の引数から、指定されていない型パラメータを推論します。
+[ポリモーフィックメソッド](polymorphic-methods.html)が呼ばれる時や[ジェネリッククラス](generic-classes.html) がインスタンス化される場合も型パラメータの指定は強制ではありません。Scalaコンパイラは文脈あるいはメソッドやコンストラクタの実際の引数から、指定されていない型パラメータを推論します。
 
 こちらは2つの例です。
 

_it/tutorials/scala-for-java-programmers.md

@@ -461,7 +461,7 @@ Java の `Object` 型のより一般的なものとしてとらえられます
       def year = y
       def month = m
       def day = d
-      override def toString(): String = year + "-" + month + "-" + day
+      override def toString(): String = s"$year-$month-$day"
 
 ここで重要なのは、クラス名とパラメータのあとに続く `extends Ord` という宣言です。
 `Date` クラスが `Ord` トレイトを継承していることを宣言しています。

_ja/tour/type-inference.md

@@ -547,7 +547,7 @@ Java 프로그래머들이 트레잇을 이해하는 가장 쉬운 길은 코드
       def year = y
       def month = m
       def day = d
-      override def toString(): String = year + "-" + month + "-" + day
+      override def toString(): String = s"$year-$month-$day"
 
 여기서 중요한 부분은 클래스 이름과 파라미터 뒤에 따라오는
 `extends Ord` 선언이다. 이 선언은 `Date` 클래스가 `Ord`

_ja/tutorials/scala-for-java-programmers.md

@@ -105,9 +105,22 @@ get poor results, try surrounding the symbol with double quotes.
 sbt 1.x always uses Scala 2.12 to compile build definitions.
 Your sbt 1.x build definition is always a Scala 2.12 program.
 
-Regardless, in your `build.sbt` you can set `scalaVersion` to anything
-you want and your actual program code will be compiled with that
-version.
+Regardless, in your `build.sbt`, you can set `scalaVersion` to whichever
+available distribution you want and your program code will be compiled with that version.
+
+### I want Scala 3.1.1 (etc); why does std lib say it's using Scala 2.13?
+
+Scala 3 currently uses the Scala 2.13 library by leveraging its seamless
+interoperability. Note that it does not necessarily ingest the latest
+version of the Scala 2.13 library.
+
+```
+Welcome to Scala 3.1.1 (17.0.2, Java OpenJDK 64-Bit Server VM).
+Type in expressions for evaluation. Or try :help.
+
+scala> util.Properties.versionString
+val res0: String = version 2.13.6
+```
 
 ### Why is my (abstract or overridden) `val` null?