Skip to content

Commit f4d87a5

Browse files
Alex1005aAlex1005a
committed
Merge branch 'main' into fix-18763
# Conflicts: # compiler/src/dotty/tools/dotc/typer/Typer.scala
2 parents 9a3b024 + 8c3f1a6 commit f4d87a5

File tree

700 files changed

+16035
-4819
lines changed

Some content is hidden

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

700 files changed

+16035
-4819
lines changed

‎.github/workflows/build-chocolatey.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
build:
2828
runs-on: windows-latest
2929
steps:
30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v5
3131
- name: Replace the version placeholder
3232
uses: richardrigutins/replace-in-files@v2
3333
with:

‎.github/workflows/build-msi.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
build:
2222
runs-on: windows-latest
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
- uses: actions/setup-java@v4
2626
with:
2727
distribution: 'adopt'
28-
java-version: '8'
28+
java-version: 17
2929
cache: 'sbt'
3030
- name: Build MSI package
3131
run: sbt 'dist-win-x86_64/Windows/packageBin'

‎.github/workflows/build-sdk.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
env:
5656
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5757
steps:
58-
- uses: actions/checkout@v4
58+
- uses: actions/checkout@v5
5959
- uses: actions/setup-java@v4
6060
with:
6161
distribution: temurin

‎.github/workflows/ci.yaml‎

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ jobs:
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
87-
uses: actions/checkout@v4
87+
uses: actions/checkout@v5
8888

8989
- name: Cleanup
9090
run: .github/workflows/cleanup.sh
9191

9292
- name: Git Checkout
93-
uses: actions/checkout@v4
93+
uses: actions/checkout@v5
9494

9595
- name: Add SBT proxy repositories
9696
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -137,13 +137,13 @@ jobs:
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
140-
uses: actions/checkout@v4
140+
uses: actions/checkout@v5
141141

142142
- name: Cleanup
143143
run: .github/workflows/cleanup.sh
144144

145145
- name: Git Checkout
146-
uses: actions/checkout@v4
146+
uses: actions/checkout@v5
147147

148148
- name: Add SBT proxy repositories
149149
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -194,13 +194,13 @@ jobs:
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
197-
uses: actions/checkout@v4
197+
uses: actions/checkout@v5
198198

199199
- name: Cleanup
200200
run: .github/workflows/cleanup.sh
201201

202202
- name: Git Checkout
203-
uses: actions/checkout@v4
203+
uses: actions/checkout@v5
204204

205205
- name: Add SBT proxy repositories
206206
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -233,7 +233,7 @@ jobs:
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
236-
uses: actions/checkout@v4
236+
uses: actions/checkout@v5
237237

238238
- name: Test
239239
run: sbt ";scala3-bootstrapped/compile; scala3-bootstrapped/testCompilation; scala3-presentation-compiler/test; scala3-language-server/test"
@@ -277,7 +277,7 @@ jobs:
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
280-
uses: actions/checkout@v4
280+
uses: actions/checkout@v5
281281

282282
- name: build binary
283283
run: sbt "dist-win-x86_64/Universal/stage"
@@ -323,13 +323,13 @@ jobs:
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
326-
uses: actions/checkout@v4
326+
uses: actions/checkout@v5
327327

328328
- name: Cleanup
329329
run: .github/workflows/cleanup.sh
330330

331331
- name: Git Checkout
332-
uses: actions/checkout@v4
332+
uses: actions/checkout@v5
333333

334334
- name: Add SBT proxy repositories
335335
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -378,13 +378,13 @@ jobs:
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
381-
uses: actions/checkout@v4
381+
uses: actions/checkout@v5
382382

383383
- name: Cleanup
384384
run: .github/workflows/cleanup.sh
385385

386386
- name: Git Checkout
387-
uses: actions/checkout@v4
387+
uses: actions/checkout@v5
388388

389389
- name: Add SBT proxy repositories
390390
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -435,13 +435,13 @@ jobs:
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
438-
uses: actions/checkout@v4
438+
uses: actions/checkout@v5
439439

440440
- name: Cleanup
441441
run: .github/workflows/cleanup.sh
442442

443443
- name: Git Checkout
444-
uses: actions/checkout@v4
444+
uses: actions/checkout@v5
445445

446446
- name: Add SBT proxy repositories
447447
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -492,13 +492,13 @@ jobs:
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
495-
uses: actions/checkout@v4
495+
uses: actions/checkout@v5
496496

497497
- name: Cleanup
498498
run: .github/workflows/cleanup.sh
499499

500500
- name: Git Checkout
501-
uses: actions/checkout@v4
501+
uses: actions/checkout@v5
502502

503503
- name: Add SBT proxy repositories
504504
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -545,13 +545,13 @@ jobs:
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
548-
uses: actions/checkout@v4
548+
uses: actions/checkout@v5
549549

550550
- name: Cleanup
551551
run: .github/workflows/cleanup.sh
552552

553553
- name: Git Checkout
554-
uses: actions/checkout@v4
554+
uses: actions/checkout@v5
555555

556556
- name: Add SBT proxy repositories
557557
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -597,13 +597,13 @@ jobs:
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
600-
uses: actions/checkout@v4
600+
uses: actions/checkout@v5
601601

602602
- name: Cleanup
603603
run: .github/workflows/cleanup.sh
604604

605605
- name: Git Checkout
606-
uses: actions/checkout@v4
606+
uses: actions/checkout@v5
607607

608608
- name: Add SBT proxy repositories
609609
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -655,13 +655,13 @@ jobs:
655655
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
656656
657657
- name: Checkout cleanup script
658-
uses: actions/checkout@v4
658+
uses: actions/checkout@v5
659659

660660
- name: Cleanup
661661
run: .github/workflows/cleanup.sh
662662

663663
- name: Git Checkout
664-
uses: actions/checkout@v4
664+
uses: actions/checkout@v5
665665
with:
666666
repository: ${{ matrix.series.repository }}
667667
ref: ${{ matrix.series.branch }}
@@ -714,13 +714,16 @@ jobs:
714714
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
715715
716716
- name: Checkout cleanup script
717-
uses: actions/checkout@v4
717+
uses: actions/checkout@v5
718718

719719
- name: Cleanup
720720
run: .github/workflows/cleanup.sh
721721

722+
- name: Set JDK 17 as default
723+
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
724+
722725
- name: Git Checkout
723-
uses: actions/checkout@v4
726+
uses: actions/checkout@v5
724727

725728
- name: Add SBT proxy repositories
726729
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -772,13 +775,13 @@ jobs:
772775
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
773776
774777
- name: Checkout cleanup script
775-
uses: actions/checkout@v4
778+
uses: actions/checkout@v5
776779

777780
- name: Cleanup
778781
run: .github/workflows/cleanup.sh
779782

780783
- name: Git Checkout
781-
uses: actions/checkout@v4
784+
uses: actions/checkout@v5
782785

783786
- name: Add SBT proxy repositories
784787
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -824,7 +827,7 @@ jobs:
824827
prepareSDK "-x86_64-pc-win32" "dist-win-x86_64" "./dist/win-x86_64/"
825828
826829
- name: Download MSI package
827-
uses: actions/download-artifact@v4
830+
uses: actions/download-artifact@v5
828831
with:
829832
name: scala.msi
830833
path: .
@@ -859,7 +862,7 @@ jobs:
859862
scala3-${{ env.RELEASE_TAG }}*.zip \
860863
scala3-${{ env.RELEASE_TAG }}*.tar.gz \
861864
scala3-${{ env.RELEASE_TAG }}*.sha256 \
862-
scala3-${{ env.RELEASE_TAG }}.msi
865+
scala3-${{ env.RELEASE_TAG }}.msi
863866
864867
- name: Publish Release
865868
run: ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonaUpload"
@@ -875,7 +878,7 @@ jobs:
875878
if: "failure() && github.event_name == 'schedule'"
876879
steps:
877880
- name: Checkout issue template
878-
uses: actions/checkout@v4
881+
uses: actions/checkout@v5
879882

880883
- name: Open an issue
881884
uses: JasonEtco/create-an-issue@v2
@@ -898,7 +901,7 @@ jobs:
898901
# Ensure that version starts with prefix 3.
899902
# In the future it can be adapted to compare with git tag or version set in the project/Build.scala
900903
version: "3."
901-
java-version: 8
904+
java-version: 17
902905

903906
build-sdk-package:
904907
uses: ./.github/workflows/build-sdk.yml
@@ -909,7 +912,7 @@ jobs:
909912
github.event_name == 'push' ||
910913
github.event_name == 'merge_group'
911914
with:
912-
java-version: 8
915+
java-version: 17
913916

914917
build-chocolatey-package:
915918
uses: ./.github/workflows/build-chocolatey.yml
@@ -923,6 +926,6 @@ jobs:
923926
uses: ./.github/workflows/test-chocolatey.yml
924927
with:
925928
version : 3.6.0-SNAPSHOT # Fake version, used only for choco tests
926-
java-version: 8
929+
java-version: 17
927930
if: github.event_name == 'pull_request' && contains(github.event.pull_request.body, '[test_chocolatey]')
928931
needs: [ build-chocolatey-package ]

‎.github/workflows/dependency-graph.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Update Dependency Graph
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v5
1212
- uses: sbt/setup-sbt@v1
1313
- uses: scalacenter/sbt-dependency-submission@v3
1414
env:

‎.github/workflows/language-reference.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
2525

2626
- name: Git Checkout
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v5
2828
with:
2929
path: 'dotty'
3030
fetch-depth: 0
@@ -49,7 +49,7 @@ jobs:
4949

5050
- name: Push changes to scala3-reference-docs
5151
if: github.event_name == 'push'
52-
uses: actions/checkout@v4
52+
uses: actions/checkout@v5
5353
with:
5454
repository: lampepfl/scala3-reference-docs
5555
fetch-depth: 0

‎.github/workflows/lts-backport.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
with:
1717
fetch-depth: 0
1818
- uses: coursier/cache-action@v6
19-
- uses: VirtusLab/scala-cli-setup@v1.8.4
19+
- uses: VirtusLab/scala-cli-setup@v1.8.5
2020
- run: scala-cli ./project/scripts/addToBackportingProject.scala -- ${{ github.sha }}
2121
env:
2222
GRAPHQL_API_TOKEN: ${{ secrets.GRAPHQL_API_TOKEN }}

‎.github/workflows/publish-chocolatey.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
runs-on: windows-latest
3232
steps:
3333
- name: Fetch the Chocolatey package from GitHub
34-
uses: actions/download-artifact@v4
34+
uses: actions/download-artifact@v5
3535
with:
3636
name: scala.nupkg
3737
- name: Publish the package to Chocolatey

‎.github/workflows/release-maven-artifacts.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Release Artifacts to Maven
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
environment:
7+
required: true
8+
type: string
9+
10+
jobs:
11+
release-maven-artifacts:
12+
runs-on: ubuntu-latest
13+
environment: ${{ inputs.environment }}
14+
steps:
15+
- uses: actions/checkout@v5
16+
- uses: actions/setup-java@v4
17+
with:
18+
distribution: 'adopt'
19+
java-version: 17
20+
cache: 'sbt'
21+
- uses: sbt/setup-sbt@v1
22+
- name: Publish Artifacts to the Maven Repository
23+
run : sbt scala3-bootstrapped-new/publish
24+
env:
25+
MAVEN_REPOSITORY_USER : ${{ secrets.MAVEN_REPOSITORY_USER }}
26+
MAVEN_REPOSITORY_TOKEN: ${{ secrets.MAVEN_REPOSITORY_TOKEN }}
27+
MAVEN_REPOSITORY_HOST : ${{ vars.MAVEN_REPOSITORY_HOST }}
28+
MAVEN_REPOSITORY_REALM: ${{ vars.MAVEN_REPOSITORY_REALM }}
29+
MAVEN_REPOSITORY_URL : ${{ vars.MAVEN_REPOSITORY_URL }}
30+
NEWNIGHTLY : ${{ vars.NEWNIGHTLY }}
31+
NIGHTLYBUILD : ${{ vars.NIGHTLYBUILD }}

0 commit comments

Comments
 (0)