Merge branch 'scala:main' into main

Author: mariogalic

.github/CODEOWNERS

@@ -0,0 +1 @@
+/_ja @scala/docs-ja

.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: html-proofer
+    versions:
+    - "> 3.15.3"

.github/workflows/build.yml

@@ -22,11 +22,11 @@ jobs:
         run: bundle exec jekyll build
       - name: HTMLProofer
         run: |
-          # # Checking for docs.scala-lang/blob/master leads to a chicken and egg problem because of the edit links of new pages.
+          # # Checking for docs.scala-lang/blob/main leads to a chicken and egg problem because of the edit links of new pages.
           bundle exec htmlproofer ./_site/\
              --only-4xx\
              --http-status-ignore "400,401,429"\
              --empty-alt-ignore\
              --allow-hash-href\
-             --url-ignore '/https://github.com/scala/docs.scala-lang/blob/master/.*/,/www.oracle.com/'
+             --url-ignore '/https://github.com/scala/docs.scala-lang/blob/main/.*/,/www.oracle.com/'
 

.gitignore

@@ -8,5 +8,4 @@ _site
 vendor/bundle
 .idea/
 /coursier
-/tut-tmp/
 .sass-cache/

Dockerfile

@@ -0,0 +1,11 @@
+FROM ruby:2.5
+
+RUN gem install bundler jekyll
+
+WORKDIR /srv/jekyll
+
+COPY Gemfile .
+COPY Gemfile.lock .
+
+RUN bundle install
+

Gemfile.lock

@@ -4,14 +4,14 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.7)
-    em-websocket (0.5.1)
+    concurrent-ruby (1.1.8)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     ethon (0.12.0)
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
-    ffi (1.13.1)
+    ffi (1.15.0)
     forwardable-extended (2.6.0)
     html-proofer (3.15.3)
       addressable (~> 2.3)
@@ -24,7 +24,7 @@ GEM
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.0)
+    jekyll (3.9.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -37,7 +37,7 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-redirect-from (0.15.0)
+    jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
@@ -50,27 +50,27 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.2.1)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.5.0)
-    nokogiri (1.11.1)
+    mini_portile2 (2.5.1)
+    nokogiri (1.11.4)
       mini_portile2 (~> 2.5.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.5)
+    public_suffix (4.0.6)
     racc (1.5.2)
     rainbow (3.0.0)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.4)
-    rouge (3.22.0)
+    rexml (3.2.5)
+    rouge (3.26.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)

_books/2-programming-scala.md

@@ -1,11 +1,11 @@
 ---
 title: "Programming Scala"
-link: https://shop.oreilly.com/product/0636920033073.do
+link: http://programming-scala.com
 image: /resources/img/books/ProgrammingScala-final-border.gif
-status: Updated for Scala 2.12
-authors: ["Alex Payne", "Dean Wampler"]
+status: Updated for Scala 3
+authors: ["Dean Wampler"]
 publisher: O’Reilly
 publisherLink: https://www.oreilly.com/
 ---
 
-Both are industry experts, Alex Payne being the lead API programmer at Twitter, a social networking service based on Scala. O’Reilly, the publisher, writes: "Learn how to be more productive with Scala, a new multi-paradigm language for the Java Virtual Machine (JVM) that integrates features of both object-oriented and functional programming. With this book, you'll discover why Scala is ideal for highly scalable, component-based applications that support concurrency and distribution. You'll also learn how to leverage the wealth of Java class libraries to meet the practical needs of enterprise and Internet projects more easily."
+Dean is a well-known member of the Scala community, using Scala recently for streaming data systems at Lightbend and now at Domino Data Lab. This edition covers the new features of Scala 3, with comparisons to Scala 2, both to explain why the changes were made and how they improve Scala, and also to enable developers using mixed Scala 2 and 3 code bases to work effectively. The book is aimed at professional programmers who want a comprehensive, in-depth, yet pragmatic tour of Scala and best practices for using it.

_config.yml

@@ -15,9 +15,9 @@ keywords:
 - Document
 - Guide
 
-scala-version: 2.13.5
-scala-212-version: 2.12.13
-scala-3-version: 3.0.0-RC1
+scala-version: 2.13.6
+scala-212-version: 2.12.14
+scala-3-version: 3.0.0
 scala-3-plugin-version: 0.5.1
 
 collections:
@@ -103,6 +103,17 @@ defaults:
       overview-name: "Scala 3 — Book"
       layout: multipage-overview
       permalink: "/scala3/book/:title.html"
+  -
+    scope:
+      path: "_overviews/scala3-migration"
+    values:
+      scala3: true
+      # num: 99 # to list them in the TOC, should be overwritten individually
+      partof: scala3-migration
+      type: section
+      overview-name: "Scala 3 Migration Guide"
+      layout: multipage-overview
+      permalink: "/scala3/guides/migration/:title.html"
   -
     scope:
       path: "_overviews/scala3-macros"

_data/compiler-options.yml

@@ -611,9 +611,22 @@
   - option: "-Vimplicits"
     schema:
       type: "Boolean"
-    description: "Show more detail on why some implicits are not applicable."
+    description: "Print dependent missing implicits."
     abbreviations:
     - "-Xlog-implicits"
+  - option: "-Vimplicits-verbose-tree"
+    schema:
+      type: "Boolean"
+    description: "Display all intermediate implicits in a chain."
+  - option: "-Vimplicits-max-refined"
+    schema:
+      type: "Int"
+      default: "0"
+    description: "max chars for printing refined types, abbreviate to `F {...}`"
+  - option: "-Vtype-diffs"
+    schema:
+      type: "Boolean"
+    description: "Print found/required error messages as colored diffs."
   - option: "-Vinline"
     schema:
       type: "String"

_data/overviews.yml

@@ -254,6 +254,11 @@
       icon: cog
       url: "compiler-options/index.html"
       description: "Various options to control how scalac compiles your code."
+    - title: Error Formatting
+      by: Torsten Schmits
+      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."
 
 
 - category: Legacy

_data/scala3-doc-nav-header.yml

@@ -10,7 +10,7 @@
     - title: Macro Tutorial
       url: "/scala3/guides/macros/index.html"
 - title: Migrate
-  url: "https://scalacenter.github.io/scala-3-migration-guide"
+  url: "/scala3/guides/migration/compatibility-intro.html"
 - title: Reference
   url: "https://dotty.epfl.ch/docs/reference/overview.html"
 - title: API

_getting-started/index.md

@@ -22,7 +22,7 @@ The Scala installer is a tool named `cs` that ensures that a JVM and standard Sc
 
 <div class="main-download">
     <div id="download-step-one">
-        <p>Follow <a href="https://get-coursier.io/docs/cli-overview.html#install-native-launcher" target="_blank">the instructions to install the <code>cs</code> launcher</a> then run:</p>
+        <p>Follow <a href="https://get-coursier.io/docs/cli-installation.html#native-launcher" target="_blank">the instructions to install the <code>cs</code> launcher</a> then run:</p>
         <p><code>$ ./cs setup</code></p>
     </div>
 </div>

_includes/footer.html

@@ -39,9 +39,9 @@
 <script src="{{ site.baseurl }}/resources/js/vendor/unslider.js" type="text/javascript"></script>
 
 <!-- Highlight -->
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js" type="text/javascript"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/languages/scala.min.js" type="text/javascript"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/languages/java.min.js" type="text/javascript"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.2/highlight.min.js" type="text/javascript"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.2/languages/scala.min.js" type="text/javascript"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.2/languages/java.min.js" type="text/javascript"></script>
 
 <!-- CodeMirror -->
 <script src="{{ site.baseurl }}/resources/js/vendor/codemirror/codemirror.js" type="text/javascript"></script>

_includes/sidebar-toc-glossary.html

@@ -5,6 +5,6 @@ <h5 class="contents">Terms</h5>
       <div id="toc"></div>
 		</div>
 		<hr>
-		<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
+		<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/main/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
 	</div>
 </div>

_includes/sidebar-toc-multipage-overview.html

@@ -62,6 +62,6 @@ <h5 class="contents">Contents</h5>
       {% endif %}
 		</div>
 		<hr>
-		<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
+		<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/main/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
 	</div>
 </div>

_includes/sidebar-toc-singlepage-overview.html

@@ -26,6 +26,6 @@ <h5 class="contents">Contents</h5>
       {% endif %}
 		</div>
 		<hr>
-		<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
+		<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/main/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
 	</div>
 </div>

_includes/sidebar-toc-style.html

@@ -52,7 +52,7 @@ <h5 class="contents">Contents</h5>
     {% endif %}
 		</div>
 		<hr>
-		<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
+		<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/main/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
 	</div>
 </div>
 	{% endif %}

_includes/sidebar-toc-tour-overview.html

@@ -43,6 +43,6 @@ <h5 class="contents">Contents</h5>
       {% endif %}
 		</div>
 		<hr>
-		<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
+		<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/main/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
 	</div>
 </div>

_includes/sidebar-toc.html

@@ -52,7 +52,7 @@ <h5 class="contents">Contents</h5>
     {% endif %}
 		</div>
 		<hr>
-		<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
+		<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/main/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
 	</div>
 </div>
 	{% endif %}

_includes/tutorial-toc.html

@@ -24,6 +24,6 @@ <h5>Contents</h5>
       {% include tutorial-tour-list.txt %}
 		</div>
 		<hr>
-		<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
+		<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/main/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
 	</div>
 </div>

_includes/upcoming-training.html

@@ -33,6 +33,6 @@ <h4>{{training.title}}</h4>
     {% endfor %}
   </div>
   <div class="call-to-action action-medium">
-    <p class="align-top">See <a href="/training/">more training</a> or <a href="https://github.com/scala/scala-lang/tree/master/training">add one to our feed</a></p>
+    <p class="align-top">See <a href="/training/">more training</a> or <a href="https://github.com/scala/scala-lang/tree/main/training">add one to our feed</a></p>
   </div>
-</div>
+</div>

_ja/index.md

@@ -27,7 +27,7 @@ scala3-sections:
       - title: "Migration Guide"
         description: "Scala 2 から Scala 3 へ移行するためのガイド"
         icon: "fa fa-suitcase"
-        link: https://scalacenter.github.io/scala-3-migration-guide/
+        link: /scala3/guides/migration/compatibility-intro.html
       - title: "Guides"
         description: "Scala 3 の言語仕様からピックアップして解説"
         icon: "fa fa-map"

_ja/scala3/contribute-to-docs.md

@@ -30,21 +30,20 @@ Scala 3 の高品質なドキュメンテーションを作るためのいくつ
 ## Scala 3 Book
 [Scala 3 Book][scala3-book] は Alvin Alexander 氏 が書いている。 この本は Scala 3 のすべての重要な機能の概説書である。これから Scala を使いはじめる読者を対象にしている。
 
-- [Sources](https://github.com/scala/docs.scala-lang/tree/master/_overviews/scala3-book)
+- [Sources](https://github.com/scala/docs.scala-lang/tree/main/_overviews/scala3-book)
 - [Issues](https://github.com/scala/docs.scala-lang/issues)
 
 ## Macros Tutorial
 [Macros Tutorial](/scala3/guides/macros)は Nicolas Stucki 氏 が書いている。この本では Scala 3 のマクロとそのベストプラクティスについて詳しく説明している。 
 
-- [Sources](https://github.com/scala/docs.scala-lang/tree/master/_overviews/scala3-macros)
+- [Sources](https://github.com/scala/docs.scala-lang/tree/main/_overviews/scala3-macros)
 - [Issues](https://github.com/scala/docs.scala-lang/issues)
 
 ## Migration Guide
-[Scala 3 Migration Guide](https://scalacenter.github.io/scala-3-migration-guide/) は Scala 2 と Scala 3 の互換性、移行に役立つツールの紹介、そして詳しい移行のガイドを含んだ包括的なドキュメントである。
+[Scala 3 Migration Guide](/scala3/guides/migration/compatibility-intro.html) は Scala 2 と Scala 3 の互換性、移行に役立つツールの紹介、そして詳しい移行のガイドを含んだ包括的なドキュメントである。
 
-- [Contribution Overview](https://scalacenter.github.io/scala-3-migration-guide/docs/contributing.html)
-- [Source](https://github.com/scalacenter/scala-3-migration-guide)
-- [Issues](https://github.com/scalacenter/scala-3-migration-guide/issues)
+- [Source](https://github.com/scala/docs.scala-lang/tree/main/_overviews/scala3-migration)
+- [Issues](https://github.com/scalacenter/docs.scala-lang/issues)
 
 
 ## Scala 3 Language Reference
@@ -56,12 +55,3 @@ The [Dotty reference](https://dotty.epfl.ch/docs/reference/overview.html) は Sc
 
 [scala3-book]: {% link _overviews/scala3-book/introduction.md %}
 
-[best-practices]: {% link _overviews/scala3-macros/best-practices.md %}
-[compiletime]: {% link _overviews/scala3-macros/tutorial/compiletime.md %}
-[cross-compilation]: https://scalacenter.github.io/scala-3-migration-guide/docs/macros/migration-tutorial.html#cross-building
-[inline]: {% link _overviews/scala3-macros/tutorial/inline.md %}
-[macros]: {% link _overviews/scala3-macros/tutorial/macros.md %}
-[migration-status]: https://scalacenter.github.io/scala-3-migration-guide/docs/macros/macro-libraries.html#macro-libraries
-[quotes]: {% link _overviews/scala3-macros/tutorial/quotes.md %}
-[tasty]: {% link _overviews/scala3-macros/tutorial/reflection.md %}
-[reflection-api]: https://dotty.epfl.ch/api/scala/quoted.html

_ja/scala3/getting-started.md

@@ -216,7 +216,7 @@ Scala 3 を使った 最初の “Hello world” プロジェクトを作れた
 以下の記事をチェックしよう:
 
 - [The Scala 3 Book](/scala3/book/introduction.html), Scala の主要な機能の導入となる一連の短いレッスンが用意されている。
-- [The migration guide](https://scalacenter.github.io/scala-3-migration-guide/) 既にある Scala 2 で書かれたコードベースを Scala 3 に移行する際に役立つ情報がまとめてある。
+- [The migration guide](/scala3/guides/migration/compatibility-intro.html) 既にある Scala 2 で書かれたコードベースを Scala 3 に移行する際に役立つ情報がまとめてある。
 
 他の Scala ユーザーと交流したいなら、いくつかのメーリングリストやリアルタイムチャットルームがある。
 これらのリソースのリストや助けを求める場所を探すには、[Scala community page](https://scala-lang.org/community/) をチェックしよう。

_ja/scala3/guides.md

@@ -8,7 +8,7 @@ scala3: true
 guides:
   - title: "Scala 2 から Scala 3 への移行"
     icon: suitcase
-    url: "https://scalacenter.github.io/scala-3-migration-guide"
+    url: "/scala3/guides/migration/compatibility-intro.html"
     description: "Scala 3 との互換性と移行について知っておくべきことすべて"
   - title: マクロ
     by: Nicolas Stucki

_ja/scala3/index.md

@@ -28,7 +28,7 @@ sections:
       - title: "Migration Guide"
         description: "Scala 2 から Scala 3 へ移行するためのガイド"
         icon: "fa fa-suitcase"
-        link: https://scalacenter.github.io/scala-3-migration-guide/
+        link: /scala3/guides/migration/compatibility-intro.html
       - title: "Guides"
         description: "Scala 3 の言語仕様からピックアップして解説"
         icon: "fa fa-map"