Merge remote-tracking branch 'origin/main' into jdk-23-build-tools

Author: SethTisue

.github/workflows/build.yml

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

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.0.5
+FROM ruby:3.1.6
 
 RUN gem install bundler:2.4.21
 

Gemfile.lock

@@ -1,53 +1,56 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3)
+    activesupport (7.2.1)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.8)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
     colorator (1.1.0)
     commonmarker (0.23.10)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
-    dnsruby (1.70.0)
+    csv (3.3.0)
+    dnsruby (1.72.2)
       simpleidn (~> 0.2.1)
-    drb (2.2.0)
-      ruby2_keywords
+    drb (2.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
     execjs (2.9.1)
-    faraday (2.9.0)
+    faraday (2.10.1)
       faraday-net_http (>= 2.0, < 3.2)
-    faraday-net_http (3.1.0)
+      logger
+    faraday-net_http (3.1.1)
       net-http
-    ffi (1.16.3)
-    ffi (1.16.3-x64-mingw-ucrt)
+    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x64-mingw-ucrt)
+    ffi (1.17.0-x86_64-linux-gnu)
     forwardable-extended (2.6.0)
     gemoji (4.1.0)
-    github-pages (231)
+    github-pages (232)
       github-pages-health-check (= 1.18.2)
-      jekyll (= 3.9.5)
+      jekyll (= 3.10.0)
       jekyll-avatar (= 0.8.0)
       jekyll-coffeescript (= 1.2.2)
-      jekyll-commonmark-ghpages (= 0.4.0)
+      jekyll-commonmark-ghpages (= 0.5.1)
       jekyll-default-layout (= 0.1.5)
       jekyll-feed (= 0.17.0)
       jekyll-gist (= 1.5.0)
@@ -84,9 +87,10 @@ GEM
       liquid (= 4.0.4)
       mercenary (~> 0.3)
       minima (= 2.5.1)
-      nokogiri (>= 1.13.6, < 2.0)
+      nokogiri (>= 1.16.2, < 2.0)
       rouge (= 3.30.0)
       terminal-table (~> 1.4)
+      webrick (~> 1.8)
     github-pages-health-check (1.18.2)
       addressable (~> 2.3)
       dnsruby (~> 1.60)
@@ -106,11 +110,12 @@ GEM
       yell (~> 2.0)
       zeitwerk (~> 2.5)
     http_parser.rb (0.8.0)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.5)
+    jekyll (3.10.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
+      csv (~> 3.0)
       em-websocket (~> 0.5)
       i18n (>= 0.7, < 2)
       jekyll-sass-converter (~> 1.0)
@@ -121,16 +126,17 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
+      webrick (>= 1.0)
     jekyll-avatar (0.8.0)
       jekyll (>= 3.0, < 5.0)
     jekyll-coffeescript (1.2.2)
       coffee-script (~> 2.2)
       coffee-script-source (~> 1.12)
     jekyll-commonmark (1.4.0)
       commonmarker (~> 0.22)
-    jekyll-commonmark-ghpages (0.4.0)
-      commonmarker (~> 0.23.7)
-      jekyll (~> 3.9.0)
+    jekyll-commonmark-ghpages (0.5.1)
+      commonmarker (>= 0.23.7, < 1.1.0)
+      jekyll (>= 3.9, < 4.0)
       jekyll-commonmark (~> 1.4.0)
       rouge (>= 2.0, < 5.0)
     jekyll-default-layout (0.1.5)
@@ -221,40 +227,38 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.4)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.0)
     mercenary (0.3.6)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.22.2)
-    mutex_m (0.2.0)
+    minitest (5.25.1)
     net-http (0.4.1)
       uri
-    nokogiri (1.16.5-arm64-darwin)
+    nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x64-mingw-ucrt)
+    nokogiri (1.16.7-x64-mingw-ucrt)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     parallel (1.22.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.4)
-    racc (1.7.3)
+    public_suffix (5.1.1)
+    racc (1.8.1)
     rainbow (3.1.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.9)
     rouge (3.30.0)
-    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
     sass (3.7.4)
@@ -265,22 +269,17 @@ GEM
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    simpleidn (0.2.1)
-      unf (~> 0.1.4)
-    strscan (3.1.0)
+    securerandom (0.3.1)
+    simpleidn (0.2.3)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.9.1)
-    unf_ext (0.0.9.1-x64-mingw-ucrt)
     unicode-display_width (1.8.0)
     uri (0.13.0)
-    webrick (1.8.1)
+    webrick (1.9.1)
     yell (2.2.2)
     zeitwerk (2.6.7)
 

README.md

@@ -1,6 +1,6 @@
 # Scala Documentation #
 
-[![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)
+[![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)
 
 This repository contains the source for the Scala documentation website, as well as the source for "Scala Improvement Process" (SIP) documents.
 

_ba/tour/automatic-closures.md

@@ -17,7 +17,7 @@ keywords:
 
 scala-version: 2.13.15
 scala-212-version: 2.12.20
-scala-3-version: 3.5.1
+scala-3-version: 3.6.2
 
 collections:
   style:

_config.yml

@@ -1,16 +1,10 @@
 - title: Getting Started
-  url: "/getting-started/index.html"
-- title: Scala 3
   url: "#"
   submenu:
-    - title: What's New?
-      url: "/scala3/new-in-scala3.html"
-    - title: Migrating From Scala 2
-      url: "/scala3/guides/migration/compatibility-intro.html"
-    - title: New Features for Scaladoc
-      url: "/scala3/scaladoc.html"
-    - title: Videos and Talks
-      url: "/scala3/talks.html"
+    - title: Install Scala
+      url: "/getting-started/install-scala.html"
+    - title: Scala IDEs
+      url: "/getting-started/scala-ides.html"
 - title: Learn
   url: "#"
   submenu:
@@ -24,6 +18,17 @@
       url: "/online-courses.html"
     - title: Online Resources
       url: "/learn.html"
+- title: Scala 3 Migration
+  url: "#"
+  submenu:
+    - title: What's New?
+      url: "/scala3/new-in-scala3.html"
+    - title: Migrating From Scala 2
+      url: "/scala3/guides/migration/compatibility-intro.html"
+    - title: New Features for Scaladoc
+      url: "/scala3/scaladoc.html"
+    - title: Videos and Talks
+      url: "/scala3/talks.html"
 - title: Tutorials
   url: "#"
   submenu:

_data/doc-nav-header.yml

@@ -21,13 +21,11 @@
   links:
     - title: Community
       url: "http://scala-lang.org/community/"
-    - title: Governance
-      url: "http://scala-lang.org/community/index.html#governance"
     - title: Scala Ambassadors
       url: "http://scala-lang.org/ambassadors/"
-    - title: Mailing Lists
-      url: "http://scala-lang.org/community/index.html#mailing-lists"
-    - title: Chat Rooms & More
+    - title: Forums
+      url: "http://scala-lang.org/community/index.html#forums"
+    - title: Chat
       url: "http://scala-lang.org/community/index.html#chat-rooms"
     - title: Libraries and Tools
       url: "http://scala-lang.org/community/index.html#community-libraries-and-tools"
@@ -43,16 +41,28 @@
 - title: Scala
   class: scala
   links:
+    - title: Governance
+      url: "http://scala-lang.org/governance/"
     - title: Blog
       url: "http://scala-lang.org/blog/"
     - title: Code of Conduct
       url: "http://scala-lang.org/conduct/"
     - title: License
       url: "http://scala-lang.org/license/"
+    - title: Security Policy
+      url: "http://scala-lang.org/security/"
 - title: Social
   class: social
   links:
     - title: GitHub
       url: "https://github.com/scala/scala"
-    - title: Twitter
-      url: "https://twitter.com/scala_lang"
+    - title: Mastodon
+      url: "https://fosstodon.org/@scala_lang"
+    - title: Bluesky
+      url: "https://bsky.app/profile/scala-lang.org"
+    - title: X
+      url: "https://x.com/scala_lang"
+    - title: Discord
+      url: "https://discord.com/invite/scala"
+    - title: LinkedIn
+      url: "https://www.linkedin.com/company/scala-center/"

_data/footer.yml

@@ -8,5 +8,7 @@
   url: https://index.scala-lang.org
 - title: Community
   url: https://www.scala-lang.org/community/
+- title: Governance
+  url: https://www.scala-lang.org/governance/
 - title: Blog
   url: https://www.scala-lang.org/blog/