Merge commit 'c9eaa14115c2654db4f54294b0571bc28a6051a4' into concurrency-cc

Author: 05st

.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/workflows/ci.yaml

@@ -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
@@ -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
 

.github/workflows/lts-backport.yaml

@@ -15,7 +15,7 @@ jobs:
         with:
           fetch-depth: 0
       - uses: coursier/cache-action@v6
-      - uses: VirtusLab/scala-cli-setup@v1.6.1
+      - uses: VirtusLab/scala-cli-setup@v1.7.0
       - run: scala-cli ./project/scripts/addToBackportingProject.scala -- ${{ github.sha }}
         env:
           GRAPHQL_API_TOKEN: ${{ secrets.GRAPHQL_API_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
 

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 "$@"

changelogs/3.4.0-RC1.md

@@ -0,0 +1,22 @@
+# Backported fixes
+
+- Fix expandParam's use of argForParam/isArgPrefixOf. [#19412](https://github.com/lampepfl/dotty/pull/19412)
+- Remove ascriptionVarargsUnpacking as we never used it [#19399](https://github.com/lampepfl/dotty/pull/19399)
+- Make explicit arguments for context bounds an error from 3.5 [#19316](https://github.com/lampepfl/dotty/pull/19316)
+- Avoid generating given definitions that loop [#19282](https://github.com/lampepfl/dotty/pull/19282)
+- Turn given loop prevention on for -source future [#19392](https://github.com/lampepfl/dotty/pull/19392)
+- Fix algorithm to prevent recursive givens [#19411](https://github.com/lampepfl/dotty/pull/19411)
+
+# Contributors
+
+Thank you to all the contributors who made this release possible 🎉
+
+According to `git shortlog -sn --no-merges 3.4.0-RC1..3.4.0-RC2` these are:
+
+```
+    15	Martin Odersky
+     4	Nicolas Stucki
+     3	Paweł Marks
+     1	Dale Wijnand
+     1	Jan Chyb
+```

changelogs/3.4.0-RC2.md

@@ -0,0 +1,17 @@
+# Backported fixes
+
+- Sync language.scala with main and backport "Add tests for context bounds migration" [#19515] (https://github.com/lampepfl/dotty/pull/19515)
+- Handle default implicits to context parameters under -3.4-migration [#19512] (https://github.com/lampepfl/dotty/pull/19512)
+
+# Contributors
+
+Thank you to all the contributors who made this release possible 🎉
+
+According to `git shortlog -sn --no-merges 3.4.0-RC2..3.4.0-RC3` these are:
+
+```
+     4	Paweł Marks
+     1	Martin Odersky
+     1	Nicolas Stucki
+
+```

changelogs/3.4.0-RC3.md

@@ -0,0 +1,14 @@
+# Backported fixes
+
+- Update jsoup dependency of Scaladoc to 7.2 [#19584](https://github.com/lampepfl/dotty/pull/19584)
+
+# Contributors
+
+Thank you to all the contributors who made this release possible 🎉
+
+According to `git shortlog -sn --no-merges 3.4.0-RC3..3.4.0-RC4` these are:
+
+```
+     2	Paweł Marks
+     1	Fabián Heredia Montiel
+```