Skip to content

Commit d53b097

Browse files
WojciechMazurWojciechMazur
authored
[chore]: Synchronize language-reference-stable with release 3.7.0 (#23117)
Synchronizes `language-reference-stable` after releaase 3.7.0.
2 parents 18fe436 + b730a5e commit d53b097

File tree

1,054 files changed

+20640
-4350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,054 files changed

+20640
-4350
lines changed

‎.github/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ RUN apt-get update && \
2222
# Install sbt
2323
ENV SBT_HOME /usr/local/sbt
2424
ENV PATH ${SBT_HOME}/bin:${PATH}
25-
ENV SBT_VERSION 1.10.5
25+
ENV SBT_VERSION 1.10.7
2626
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

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
## Workaround for https://github.com/actions/runner/issues/2033 (See https://github.com/scala/scala3/pull/19720)
8181
- name: Reset existing repo
8282
run: |
83-
git config --global --add safe.directory /__w/scala3/scala3
83+
git config --global --add safe.directory $GITHUB_WORKSPACE
8484
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
8585
8686
- name: Checkout cleanup script
@@ -133,7 +133,7 @@ jobs:
133133

134134
- name: Reset existing repo
135135
run: |
136-
git config --global --add safe.directory /__w/scala3/scala3
136+
git config --global --add safe.directory $GITHUB_WORKSPACE
137137
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
138138
139139
- name: Checkout cleanup script
@@ -190,7 +190,7 @@ jobs:
190190

191191
- name: Reset existing repo
192192
run: |
193-
git config --global --add safe.directory /__w/scala3/scala3
193+
git config --global --add safe.directory $GITHUB_WORKSPACE
194194
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
195195
196196
- name: Checkout cleanup script
@@ -229,7 +229,7 @@ jobs:
229229
- name: Reset existing repo
230230
shell: cmd
231231
run: |
232-
git config --global --add safe.directory /__w/scala3/scala3
232+
git config --global --add safe.directory $GITHUB_WORKSPACE
233233
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
234234
235235
- name: Git Checkout
@@ -273,7 +273,7 @@ jobs:
273273
- name: Reset existing repo
274274
shell: cmd
275275
run: |
276-
git config --global --add safe.directory /__w/scala3/scala3
276+
git config --global --add safe.directory $GITHUB_WORKSPACE
277277
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
278278
279279
- name: Git Checkout
@@ -319,7 +319,7 @@ jobs:
319319

320320
- name: Reset existing repo
321321
run: |
322-
git config --global --add safe.directory /__w/scala3/scala3
322+
git config --global --add safe.directory $GITHUB_WORKSPACE
323323
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
324324
325325
- name: Checkout cleanup script
@@ -374,7 +374,7 @@ jobs:
374374
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
375375
- name: Reset existing repo
376376
run: |
377-
git config --global --add safe.directory /__w/scala3/scala3
377+
git config --global --add safe.directory $GITHUB_WORKSPACE
378378
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
379379
380380
- name: Checkout cleanup script
@@ -391,7 +391,7 @@ jobs:
391391

392392
- name: Test
393393
run: |
394-
git config --global --add safe.directory /__w/scala3/scala3
394+
git config --global --add safe.directory $GITHUB_WORKSPACE
395395
git submodule sync
396396
git submodule update --init --recursive --jobs 7
397397
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"
@@ -431,7 +431,7 @@ jobs:
431431
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
432432
- name: Reset existing repo
433433
run: |
434-
git config --global --add safe.directory /__w/scala3/scala3
434+
git config --global --add safe.directory $GITHUB_WORKSPACE
435435
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
436436
437437
- name: Checkout cleanup script
@@ -448,7 +448,7 @@ jobs:
448448

449449
- name: Test
450450
run: |
451-
git config --global --add safe.directory /__w/scala3/scala3
451+
git config --global --add safe.directory $GITHUB_WORKSPACE
452452
git submodule sync
453453
git submodule update --init --recursive --jobs 7
454454
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"
@@ -488,7 +488,7 @@ jobs:
488488
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
489489
- name: Reset existing repo
490490
run: |
491-
git config --global --add safe.directory /__w/scala3/scala3
491+
git config --global --add safe.directory $GITHUB_WORKSPACE
492492
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
493493
494494
- name: Checkout cleanup script
@@ -505,7 +505,7 @@ jobs:
505505

506506
- name: Test
507507
run: |
508-
git config --global --add safe.directory /__w/scala3/scala3
508+
git config --global --add safe.directory $GITHUB_WORKSPACE
509509
git submodule sync
510510
git submodule update --init --recursive --jobs 7
511511
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"
@@ -541,7 +541,7 @@ jobs:
541541

542542
- name: Reset existing repo
543543
run: |
544-
git config --global --add safe.directory /__w/scala3/scala3
544+
git config --global --add safe.directory $GITHUB_WORKSPACE
545545
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
546546
547547
- name: Checkout cleanup script
@@ -593,7 +593,7 @@ jobs:
593593

594594
- name: Reset existing repo
595595
run: |
596-
git config --global --add safe.directory /__w/scala3/scala3
596+
git config --global --add safe.directory $GITHUB_WORKSPACE
597597
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
598598
599599
- name: Checkout cleanup script
@@ -630,7 +630,10 @@ jobs:
630630
- ${{ github.workspace }}/../../cache/general:/root/.cache
631631
strategy:
632632
matrix:
633-
branch: [main, lts-3.3]
633+
series: [
634+
{repository: scala/scala3, branch: main}, # Scala Next nightly
635+
{repository: scala/scala3-lts, branch: lts-3.3} # Scala LTS nightly
636+
]
634637
needs: [test_non_bootstrapped, test, mima, community_build_a, community_build_b, community_build_c, test_sbt, test_java8]
635638
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'scala/scala3'"
636639
env:
@@ -648,7 +651,7 @@ jobs:
648651
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
649652
- name: Reset existing repo
650653
run: |
651-
git config --global --add safe.directory /__w/scala3/scala3
654+
git config --global --add safe.directory $GITHUB_WORKSPACE
652655
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
653656
654657
- name: Checkout cleanup script
@@ -660,7 +663,8 @@ jobs:
660663
- name: Git Checkout
661664
uses: actions/checkout@v4
662665
with:
663-
ref: ${{ matrix.branch }}
666+
repository: ${{ matrix.series.repository }}
667+
ref: ${{ matrix.series.branch }}
664668

665669
- name: Add SBT proxy repositories
666670
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -706,7 +710,7 @@ jobs:
706710
steps:
707711
- name: Reset existing repo
708712
run: |
709-
git config --global --add safe.directory /__w/scala3/scala3
713+
git config --global --add safe.directory $GITHUB_WORKSPACE
710714
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
711715
712716
- name: Checkout cleanup script
@@ -723,7 +727,7 @@ jobs:
723727

724728
- name: Generate Website
725729
run: |
726-
git config --global --add safe.directory /__w/scala3/scala3
730+
git config --global --add safe.directory $GITHUB_WORKSPACE
727731
./project/scripts/genDocs -doc-snapshot
728732
729733
- name: Deploy Website to https://dotty.epfl.ch
@@ -764,7 +768,7 @@ jobs:
764768
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
765769
- name: Reset existing repo
766770
run: |
767-
git config --global --add safe.directory /__w/scala3/scala3
771+
git config --global --add safe.directory $GITHUB_WORKSPACE
768772
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
769773
770774
- name: Checkout cleanup script
@@ -832,9 +836,10 @@ jobs:
832836
sha256sum "${msiInstaller}" > "${msiInstaller}.sha256"
833837
834838
- name: Install GH CLI
835-
uses: dev-hanz-ops/[email protected].0
839+
uses: dev-hanz-ops/[email protected].1
836840
with:
837841
gh-cli-version: 2.59.0
842+
838843
# Create the GitHub release
839844
- name: Create GitHub Release
840845
env:
@@ -843,7 +848,7 @@ jobs:
843848
run: |
844849
# We need to config safe.directory in every step that might reference git
845850
# It is not persisted between steps
846-
git config --global --add safe.directory /__w/scala3/scala3
851+
git config --global --add safe.directory $GITHUB_WORKSPACE
847852
gh release create \
848853
--draft \
849854
--title "${{ env.RELEASE_TAG }}" \

‎.github/workflows/lts-backport.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
fetch-depth: 0
1717
- uses: coursier/cache-action@v6
18-
- uses: VirtusLab/scala-cli-setup@v1.5.4
18+
- uses: VirtusLab/scala-cli-setup@v1.7.1
1919
- run: scala-cli ./project/scripts/addToBackportingProject.scala -- ${{ github.sha }}
2020
env:
2121
GRAPHQL_API_TOKEN: ${{ secrets.GRAPHQL_API_TOKEN }}

‎.github/workflows/publish-sdkman.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- platform: WINDOWS_64
4747
archive : 'scala3-${{ inputs.version }}-x86_64-pc-win32.zip'
4848
steps:
49-
- uses: sdkman/sdkman-release-action@1f2d4209b4f5a38721d4ae20014ea8e1689d869e
49+
- uses: sdkman/sdkman-release-action@a60691d56279724b4c9ff0399c0ae21d641ab75e
5050
with:
5151
CONSUMER-KEY : ${{ secrets.CONSUMER-KEY }}
5252
CONSUMER-TOKEN : ${{ secrets.CONSUMER-TOKEN }}

‎.github/workflows/spec.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
env:
5050
USER_FOR_TEST: ${{ secrets.SPEC_DEPLOY_USER }}
5151
if: ${{ env.USER_FOR_TEST != '' }}
52-
uses: burnett01/[email protected].1
52+
uses: burnett01/[email protected].2
5353
with:
5454
switches: -rzv
5555
path: docs/_spec/_site/

‎.github/workflows/launchers.yml renamed to ‎.github/workflows/test-launchers.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ jobs:
2828

2929
linux-aarch64:
3030
name: Deploy and Test on Linux ARM64 architecture
31-
runs-on: macos-latest
32-
if: ${{ false }}
31+
runs-on: ubuntu-24.04-arm
3332
steps:
3433
- uses: actions/checkout@v4
3534
- name: Set up JDK 17

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ testlogs/
6262

6363
# Put local stuff here
6464
local/
65-
compiler/test/debug/Gen.jar
6665

6766
/bin/.cp
6867

‎.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
[submodule "community-build/community-projects/fastparse"]
2020
path = community-build/community-projects/fastparse
2121
url = https://github.com/dotty-staging/fastparse
22-
[submodule "community-build/community-projects/stdLib213"]
23-
path = community-build/community-projects/stdLib213
24-
url = https://github.com/dotty-staging/scala213
2522
[submodule "community-build/community-projects/sourcecode"]
2623
path = community-build/community-projects/sourcecode
2724
url = https://github.com/dotty-staging/sourcecode

‎bin/replQ

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env bash
2+
3+
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/.."
4+
. $ROOT/bin/commonQ
5+
6+
java -Dscala.usejavacp=true -cp $cp dotty.tools.repl.Main -usejavacp "$@"

0 commit comments

Comments
 (0)