Merge branch 'main' into flexibleunpickle

Author: HarrisL2

.git-blame-ignore-revs

@@ -0,0 +1 @@
+46a26945a172429740ebdd1fc83517130670080b

.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.10.5
+ENV SBT_VERSION 1.10.7
 RUN curl -sL "https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz" | gunzip | tar -x -C /usr/local

.github/ISSUE_TEMPLATE/bug.md

@@ -9,19 +9,33 @@ assignees: ''
 
 ## Compiler version
 
-If you're not sure what version you're using, run `print scalaVersion` from sbt
-(if you're running scalac manually, use `scalac -version` instead).
+If you're not sure which version you're using, run `print scalaVersion` from sbt.
+(If you're running scalac manually, use `scalac -version` instead.)
+
+If possible, check if your issue appears in the nightly version of the compiler! For example, in Scala CLI (the `scala`/`scala-cli` runner script), you can use `//> using scala 3.nightly` (or `-S 3.nightly` from the command line) to grab the latest one.
 
 ## Minimized code
 
 <!--
 This code should be self contained, compilable (with possible failures) and as small as possible.
 
-Ideally, we should be able to just copy this code in a file and run `scalac` (and maybe `scala`) to reproduce the issue.
+Ideally, we should be able to just copy this code to a file and run `scalac` (and maybe `scala`) to reproduce the issue.
+
+If the code has external dependencies, please provide the Scala CLI directives (or SBT/other build tool configuration) that describe them.
+Also note that it's easier and faster for the maintenance team to address issues minimised to reproduce bugs without external dependencies.
+
+It's most convenient to also include `using` directives for the Scala version that demonstrates the problem,
+any compiler command-line options, as well as dependencies. An example is provided.
+
+It's also fine to paste the transcript of a REPL session. Note that some bugs may be specific to the REPL.
 -->
 
-```Scala
-println("hello, world")
+```scala
+//> using scala 3.7.0
+//> using options -Wall -Werror
+//> using dep com.outr::scribe:3.16.1
+
+@main def test = println("hello, world")
 ```
 
 ## Output

.github/workflows/ci.yaml

@@ -26,10 +26,10 @@ 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) 
+# 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 
+# - 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' }}
@@ -630,7 +630,10 @@ jobs:
         - ${{ github.workspace }}/../../cache/general:/root/.cache
     strategy:
       matrix:
-        branch: [main, lts-3.3]
+        series: [
+          {repository: scala/scala3, branch: main}, # Scala Next nightly
+          {repository: scala/scala3-lts, branch: lts-3.3} # Scala LTS nightly
+        ]
     needs: [test_non_bootstrapped, test, mima, community_build_a, community_build_b, community_build_c, test_sbt, test_java8]
     if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'scala/scala3'"
     env:
@@ -660,7 +663,8 @@ jobs:
       - name: Git Checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ matrix.branch }}
+          repository: ${{ matrix.series.repository }}
+          ref: ${{ matrix.series.branch }}
 
       - name: Add SBT proxy repositories
         run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -688,7 +692,7 @@ jobs:
       - name: Publish Nightly
         if: "steps.not_yet_published.outcome == 'success'"
         run: |
-          ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonatypeBundleRelease"
+          ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonaRelease"
 
   nightly_documentation:
     runs-on: [self-hosted, Linux]
@@ -832,7 +836,7 @@ jobs:
           sha256sum "${msiInstaller}" > "${msiInstaller}.sha256"
 
       - name: Install GH CLI
-        uses: dev-hanz-ops/[email protected].0
+        uses: dev-hanz-ops/[email protected].1
         with:
           gh-cli-version: 2.59.0
 
@@ -858,7 +862,7 @@ jobs:
           scala3-${{ env.RELEASE_TAG }}.msi 
 
       - name: Publish Release
-        run: ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonatypeBundleUpload"
+        run: ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonaUpload"
 
 
   open_issue_on_failure:

.github/workflows/language-reference.yaml

@@ -70,22 +70,3 @@ jobs:
           fi
           cd ..
 
-  backport-to-main:
-    name: Create pull request with backport to main
-    permissions:
-      pull-requests: write  # for repo-sync/pull-request to create a PR
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
-    steps:
-      - uses: actions/checkout@v4
-      - uses: repo-sync/pull-request@v2
-        with:
-          destination_branch: main
-          pr_label: area:documentation
-          pr_title: Sync with the stable documentation branch
-          pr_body: |
-            This pull request is syncing the main with changes from language-reference-stable.
-
-            It was created automatically after ${{ github.event.head_commit.id }} by @${{ github.event.head_commit.author.username }}
-          pr_assignee: ${{ github.event.head_commit.author.username }}
-

.github/workflows/lts-backport.yaml

@@ -7,15 +7,16 @@ on:
 
 jobs:
   add-to-backporting-project:
-    if: "!contains(github.event.push.head_commit.message, '[Next only]')"
+    if: "!contains(github.event.push.head_commit.message, '[Next only]') &&
+         github.repository == 'scala/scala3'"
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: coursier/cache-action@v6
-      - uses: VirtusLab/scala-cli-setup@v1.5.4
+      - uses: VirtusLab/scala-cli-setup@v1.8.0
       - run: scala-cli ./project/scripts/addToBackportingProject.scala -- ${{ github.sha }}
         env:
           GRAPHQL_API_TOKEN: ${{ secrets.GRAPHQL_API_TOKEN }}

.github/workflows/publish-sdkman.yml

@@ -46,7 +46,7 @@ jobs:
           - platform: WINDOWS_64
             archive : 'scala3-${{ inputs.version }}-x86_64-pc-win32.zip'
     steps:
-      - uses: sdkman/sdkman-release-action@1f2d4209b4f5a38721d4ae20014ea8e1689d869e
+      - uses: sdkman/sdkman-release-action@2800d4359ae097a99afea7e0370f0c6e726182a4
         with:
           CONSUMER-KEY   : ${{ secrets.CONSUMER-KEY }}
           CONSUMER-TOKEN : ${{ secrets.CONSUMER-TOKEN }}

.github/workflows/spec.yml

@@ -49,7 +49,7 @@ jobs:
         env:
           USER_FOR_TEST: ${{ secrets.SPEC_DEPLOY_USER }}
         if: ${{ env.USER_FOR_TEST != '' }}
-        uses: burnett01/[email protected].1
+        uses: burnett01/[email protected].2
         with:
           switches: -rzv
           path: docs/_spec/_site/

.gitignore

@@ -62,7 +62,6 @@ testlogs/
 
 # Put local stuff here
 local/
-compiler/test/debug/Gen.jar
 
 /bin/.cp
 

.jvmopts

@@ -1,5 +1,5 @@
 -Xss1m
--Xms512m
--Xmx4096m
+-Xms1024m
+-Xmx8192m
 -XX:MaxInlineLevel=35
 -XX:ReservedCodeCacheSize=512m

bin/replQ

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/.."
+. $ROOT/bin/commonQ
+
+java -Dscala.usejavacp=true -cp $cp dotty.tools.repl.Main -usejavacp "$@"