Merge branch 'release-3.6.4' into language-reference-stable

Author: WojciechMazur

.github/Dockerfile

@@ -22,5 +22,5 @@ RUN apt-get update && \
 # Install sbt
 ENV SBT_HOME /usr/local/sbt
 ENV PATH ${SBT_HOME}/bin:${PATH}
-ENV SBT_VERSION 1.9.0
+ENV SBT_VERSION 1.10.5
 RUN curl -sL "https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz" | gunzip | tar -x -C /usr/local

.github/PULL_REQUEST_TEMPLATE/fix-issue.md

@@ -8,7 +8,7 @@ assignees: ''
 
 <!--
   TODO first sign the CLA
-  https://www.lightbend.com/contribute/cla/scala
+  https://contribute.akka.io/cla/scala
 -->
 
 ## Fix #XYZ

.github/PULL_REQUEST_TEMPLATE/other-pr.md

@@ -8,7 +8,7 @@ assignees: ''
 
 <!--
   TODO first sign the CLA
-  https://www.lightbend.com/contribute/cla/scala
+  https://contribute.akka.io/cla/scala
 -->
 
 ## Description

.github/workflows/ci.yaml

@@ -26,6 +26,14 @@ on:
     - cron: '0 3 * * *'  # Every day at 3 AM
   workflow_dispatch:
 
+# Cancels any in-progress runs within the same group identified by workflow name and GH reference (branch or tag)
+# For example it would:
+# - terminate previous PR CI execution after pushing more changes to the same PR branch
+# - terminate previous on-push CI run after merging new PR to main
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 env:
   DOTTY_CI_RUN: true
   DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
@@ -818,22 +826,23 @@ jobs:
           path: .
       - name: Prepare MSI package
         shell: bash
-        run: | 
+        run: |
           msiInstaller="scala3-${{ env.RELEASE_TAG }}.msi"
           mv scala.msi "${msiInstaller}"
           sha256sum "${msiInstaller}" > "${msiInstaller}.sha256"
 
       - name: Install GH CLI
         uses: dev-hanz-ops/[email protected]
         with:
-          gh-cli-version: 2.59.0 
-          
+          gh-cli-version: 2.59.0
       # Create the GitHub release
       - name: Create GitHub Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
         shell: bash
         run: |
+          # We need to config safe.directory in every step that might reference git
+          # It is not persisted between steps
           git config --global --add safe.directory /__w/scala3/scala3
           gh release create \
           --draft \
@@ -901,14 +910,14 @@ jobs:
     uses: ./.github/workflows/build-chocolatey.yml
     needs: [ build-sdk-package ]
     with:
-      version: 3.6.0-local # TODO: FIX THIS
+      version: 3.6.0-SNAPSHOT # Fake version, used only for choco tests
       url    : https://api.github.com/repos/scala/scala3/actions/artifacts/${{ needs.build-sdk-package.outputs.win-x86_64-id }}/zip
       digest : ${{ needs.build-sdk-package.outputs.win-x86_64-digest }}
 
   test-chocolatey-package:
     uses: ./.github/workflows/test-chocolatey.yml
     with:
-      version     : 3.6.0-local # TODO: FIX THIS
+      version     : 3.6.0-SNAPSHOT # Fake version, used only for choco tests
       java-version: 8
     if: github.event_name == 'pull_request' && contains(github.event.pull_request.body, '[test_chocolatey]')
     needs: [ build-chocolatey-package ]

.github/workflows/cla.yml

@@ -3,20 +3,11 @@ on:
   pull_request:
     branches-ignore:
       - 'language-reference-stable'
-  push:
-    branches:
-      - 'language-reference-stable'
-  merge_group:
-permissions:
-  contents: write
-  pull-requests: write
-
 jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - run: ./project/scripts/check-cla.sh
-      if: github.event_name == 'pull_request'
-      env:
-        AUTHOR: ${{ github.event.pull_request.user.login }}
+      - name: Verify CLA
+        uses: scala/cla-checker@v1
+        with:
+          author: ${{ github.event.pull_request.user.login }}

.github/workflows/lts-backport.yaml

@@ -15,7 +15,7 @@ jobs:
         with:
           fetch-depth: 0
       - uses: coursier/cache-action@v6
-      - uses: VirtusLab/[email protected].3
+      - uses: VirtusLab/[email protected].4
       - run: scala-cli ./project/scripts/addToBackportingProject.scala -- ${{ github.sha }}
         env:
           GRAPHQL_API_TOKEN: ${{ secrets.GRAPHQL_API_TOKEN }}

.github/workflows/publish-chocolatey.yml

@@ -35,5 +35,5 @@ jobs:
         with:
           name: scala.nupkg
       - name: Publish the package to Chocolatey
-        run: choco push scala.nupkg --source https://push.chocolatey.org/ --api-key ${{ secrets.API-KEY }}
+        run: choco push scala.${{inputs.version}}.nupkg --source https://push.chocolatey.org/ --api-key ${{ secrets.API-KEY }}
 

.github/workflows/publish-winget.yml

@@ -26,7 +26,7 @@ jobs:
   publish:
     runs-on: windows-latest
     steps:
-      - uses: vedantmgoyal9/winget-releaser@b87a066d9e624db1394edcd947f8c4e5a7e30cd7
+      - uses: vedantmgoyal9/winget-releaser@4ffc7888bffd451b357355dc214d43bb9f23917e
         with:
           identifier      : Scala.Scala.3
           version         : ${{ inputs.version }}

.github/workflows/test-cc.yml

@@ -0,0 +1,31 @@
+name: Scala 3 with Capture Checking
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    paths:
+      - .github/workflows/test-cc.yml
+      - scala2-library-cc/**
+      - scala2-library-cc-tasty/**
+      - compiler/src/dotty/tools/dotc/cc/**
+      ## Capture Checking Tests
+      - tests/pos-custom-args/captures/**
+      - tests/run-custom-args/captures/**
+      - tests/neg-custom-args/captures/**
+
+env:
+  DOTTY_CI_RUN: true
+  DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+
+jobs:
+  suite-with-stdlib-cc:
+    name: Test Suite with the CC Standard Library
+    runs-on: ubuntu-latest
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v4
+      - uses: sbt/setup-sbt@v1
+      - name: Test with Scala 2 library with CC TASTy
+        run: ./project/scripts/sbt ";set ThisBuild/Build.scala2Library := Build.Scala2LibraryCCTasty ;scala3-bootstrapped/test"

.github/workflows/test-chocolatey.yml

@@ -21,7 +21,10 @@ on:
 
 env:
   CHOCOLATEY-REPOSITORY: chocolatey-pkgs
-  DOTTY_CI_INSTALLATION: ${{ secrets.GITHUB_TOKEN }}
+  # Controls behaviour of chocolatey{Install,Uninstall}.ps1 scripts
+  # During snapshot releases it uses a different layout and requires access token to GH Actions artifacts
+  # During stable releases it uses publically available archives
+  DOTTY_CI_INSTALLATION: ${{ endsWith(inputs.version, '-SNAPSHOT') && secrets.GITHUB_TOKEN || '' }}
 
 jobs:
   test:

.vscode-template/settings.json

@@ -9,7 +9,6 @@
     "**/*.class": true,
     "**/*.tasty": true,
     "**/target/": true,
-    "community-build/community-projects": true,
-    "tests/pos-with-compiler-cc/dotc/**/*.scala": true
+    "community-build/community-projects": true
   }
 }

MAINTENANCE.md

@@ -63,39 +63,48 @@ At the end of their supervision period, the supervisor reports to the team durin
 
 ## Maintenance List
 
-The following is the list of all the principal areas of the compiler and the core team members who are responsible for their maintenance:
+The following is the list of all the principal areas of the compiler and the internal team members who are responsible for their maintenance:
 
 ### Compiler
-- Parser: @odersky, @hamzaremmal
-- Typer: @odersky, @smarter, (@dwijnand), @noti0nal
+- Parser: @odersky, @hamzaremmal, @KacperFKorban
+- Typer: @odersky, @smarter, (@dwijnand), @noti0nal, @EugeneFlesselle, @KacperFKorban, @bracevac
 - Erasure: @smarter, @odersky
-- Enums: @bishabosha
-- Derivation & Mirrors: @bishabosha, (@dwijnand), @EugeneFlesselle
-- Export: @bishabosha, @odersky
-- Pattern Matching: @dwijnand, (@liufengyun), @sjrd
-- Inline: @nicolasstucki, @odersky, @hamzaremmal
-- Metaprogramming (Quotes, Reflect, Staging): @nicolasstucki, @jchyb, @hamzaremmal
-- Match types: @sjrd, @dwijnand, @Decel, @Linyxus
+- Enums:
+- Derivation & Mirrors: (@dwijnand), @EugeneFlesselle
+- Export: @odersky
+- Pattern Matching: @dwijnand, @sjrd, @noti0na1
+- Inline: @odersky, @jchyb, @hamzaremmal, @EugeneFlesselle
+- Metaprogramming (Quotes, Reflect, Staging): @jchyb, @hamzaremmal
+- Match types: @sjrd, @dwijnand, @Linyxus, @EugeneFlesselle
 - GADT: @dwijnand, @Linyxus
-- Initialization checker: @olhotak, @liufengyun
-- Safe nulls: @noti0na1, @olhotak
-- Transforms: @szymon-rd, @sjrd, @odersky, @smarter
-- tailrec: @sjrd, @mbovel
+- Initialization checker:
+- Transforms: @sjrd, @odersky, @smarter
+- Tailrec: @sjrd, @mbovel
 - JS backend: @sjrd
-- JVM backend: @sjrd
-- Java-compat: @smarter, @dwijnand
-- Capture checker: @odersky, @Linyxus
+- JVM backend: @sjrd, @hamzaremmal
+- Java-compat: @smarter, @dwijnand, @hamzaremmal
+- Extension Methods: @odersky, @dwijnand
+- Safe nulls (experimental): @noti0na1
+- Capture checker (experimental): @odersky, @Linyxus, @bracevac, @noti0na1
+- Modularity (experimental): @KacperFKorban
+- Named Tuples (experimental): @odersky, @aherlihy
 
 ### Tooling
-- REPL: @dwijnand, @prolativ
+- REPL: @dwijnand
+- Runner/CLI: @Gedochao, (@tgodzik)
+- IDE: @tgodzik, (@kasiaMarek)
 - Scaladoc: @Florian3k
-- SemanticDB: @tanishiking
-- Coverage: @TheElectronWill
-- Linting (especially unused warnings) / Reporting UX: @szymon-rd
+- SemanticDB: @natsukagami, (@tanishiking)
+- Coverage: @KacperFKorban
+- Linting (especially unused warnings) / Reporting UX: @KacperFKorban
+- Presentation Compiler: @rochala, @tgodzik, @kasiaMarek, @natsukagami
+- Debug Adapter: @adpi2, (@tgodzik)
+- Scastie: @rochala
 
 ### Infrastructure
-- CI: @hamzaremmal
+- CI: @hamzaremmal, (@WojciechMazur)
 - Community Build: @hamzaremmal
 - Open Community Build: @WojciechMazur
-- Vulpix: @dwijnand, @prolativ
+- Vulpix: @dwijnand, @prolativ, @hamzaremmal
 - Benchmarks: @mbovel
+- Releases: @WojciechMazur, @prolativ

build.sbt

@@ -36,6 +36,7 @@ val `dist-linux-aarch64` = Build.`dist-linux-aarch64`
 val `community-build` = Build.`community-build`
 val `sbt-community-build` = Build.`sbt-community-build`
 val `scala3-presentation-compiler` = Build.`scala3-presentation-compiler`
+val `scala3-presentation-compiler-testcases` = Build.`scala3-presentation-compiler-testcases`
 
 val sjsSandbox = Build.sjsSandbox
 val sjsJUnitTests = Build.sjsJUnitTests