Skip to content

Commit 82817f3

Browse files
committed
Merge branch 'release-3.7.4' into language-reference-stable
2 parents 4f51b27 + 40be760 commit 82817f3

File tree

241 files changed

+6538
-1796
lines changed

Some content is hidden

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

241 files changed

+6538
-1796
lines changed

.github/workflows/build-msi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
build:
2222
runs-on: windows-latest
2323
steps:
24-
- uses: actions/checkout@v4
25-
- uses: actions/setup-java@v4
24+
- uses: actions/checkout@v5
25+
- uses: actions/setup-java@v5
2626
with:
2727
distribution: 'adopt'
2828
java-version: '8'

.github/workflows/build-sdk.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ jobs:
5555
env:
5656
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5757
steps:
58-
- uses: actions/checkout@v4
59-
- uses: actions/setup-java@v4
58+
- uses: actions/checkout@v5
59+
- uses: actions/setup-java@v5
6060
with:
6161
distribution: temurin
6262
java-version: ${{ inputs.java-version }}

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ jobs:
824824
prepareSDK "-x86_64-pc-win32" "dist-win-x86_64" "./dist/win-x86_64/"
825825
826826
- name: Download MSI package
827-
uses: actions/download-artifact@v4
827+
uses: actions/download-artifact@v5
828828
with:
829829
name: scala.msi
830830
path: .

.github/workflows/language-reference.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
ssh-key: ${{ secrets.DOCS_KEY }}
3232

3333
- name: Set up JDK 17
34-
uses: actions/setup-java@v4
34+
uses: actions/setup-java@v5
3535
with:
3636
distribution: 'temurin'
3737
java-version: 17

.github/workflows/lts-backport.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
with:
1717
fetch-depth: 0
1818
- uses: coursier/cache-action@v6
19-
- uses: VirtusLab/scala-cli-setup@v1.9.0
19+
- uses: VirtusLab/scala-cli-setup@v1.9.1
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/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@2800d4359ae097a99afea7e0370f0c6e726182a4
49+
- uses: sdkman/sdkman-release-action@c70225d437d17182d19476702b671513dc8bf048
5050
with:
5151
CONSUMER-KEY : ${{ secrets.CONSUMER-KEY }}
5252
CONSUMER-TOKEN : ${{ secrets.CONSUMER-TOKEN }}

.github/workflows/scaladoc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/checkout@v4
3232

3333
- name: Set up JDK 17
34-
uses: actions/setup-java@v4
34+
uses: actions/setup-java@v5
3535
with:
3636
distribution: 'temurin'
3737
java-version: 17
@@ -80,7 +80,7 @@ jobs:
8080
uses: actions/checkout@v4
8181

8282
- name: Set up JDK 17
83-
uses: actions/setup-java@v4
83+
uses: actions/setup-java@v5
8484
with:
8585
distribution: 'temurin'
8686
java-version: 17

.github/workflows/stdlib.yaml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Git Checkout
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818

1919
- name: Set up JDK 17
20-
uses: actions/setup-java@v4
20+
uses: actions/setup-java@v5
2121
with:
2222
distribution: 'temurin'
2323
java-version: 17
@@ -32,10 +32,10 @@ jobs:
3232
##needs: [scala-library-nonbootstrapped] Add when we add support for caching here
3333
steps:
3434
- name: Git Checkout
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v5
3636

3737
- name: Set up JDK 17
38-
uses: actions/setup-java@v4
38+
uses: actions/setup-java@v5
3939
with:
4040
distribution: 'temurin'
4141
java-version: 17
@@ -50,10 +50,10 @@ jobs:
5050
needs : [scala3-compiler-nonbootstrapped, scala3-sbt-bridge-nonbootstrapped, scala-library-nonbootstrapped, scala3-library-nonbootstrapped]
5151
steps:
5252
- name: Git Checkout
53-
uses: actions/checkout@v4
53+
uses: actions/checkout@v5
5454

5555
- name: Set up JDK 17
56-
uses: actions/setup-java@v4
56+
uses: actions/setup-java@v5
5757
with:
5858
distribution: 'temurin'
5959
java-version: 17
@@ -68,10 +68,10 @@ jobs:
6868
##needs: [scala-library-bootstrapped] Add when we add support for caching here
6969
steps:
7070
- name: Git Checkout
71-
uses: actions/checkout@v4
71+
uses: actions/checkout@v5
7272

7373
- name: Set up JDK 17
74-
uses: actions/setup-java@v4
74+
uses: actions/setup-java@v5
7575
with:
7676
distribution: 'temurin'
7777
java-version: 17
@@ -86,10 +86,10 @@ jobs:
8686
##needs: [scala3-library-nonbootstrapped] Add when we add support for caching here
8787
steps:
8888
- name: Git Checkout
89-
uses: actions/checkout@v4
89+
uses: actions/checkout@v5
9090

9191
- name: Set up JDK 17
92-
uses: actions/setup-java@v4
92+
uses: actions/setup-java@v5
9393
with:
9494
distribution: 'temurin'
9595
java-version: 17
@@ -103,10 +103,10 @@ jobs:
103103
##needs: [tasty-core-nonbootstrapped, scala3-library-nonbootstrapped] Add when we add support for caching here
104104
steps:
105105
- name: Git Checkout
106-
uses: actions/checkout@v4
106+
uses: actions/checkout@v5
107107

108108
- name: Set up JDK 17
109-
uses: actions/setup-java@v4
109+
uses: actions/setup-java@v5
110110
with:
111111
distribution: 'temurin'
112112
java-version: 17
@@ -120,10 +120,10 @@ jobs:
120120
##needs: [scala3-compiler-nonbootstrapped] Add when we add support for caching here
121121
steps:
122122
- name: Git Checkout
123-
uses: actions/checkout@v4
123+
uses: actions/checkout@v5
124124

125125
- name: Set up JDK 17
126-
uses: actions/setup-java@v4
126+
uses: actions/setup-java@v5
127127
with:
128128
distribution: 'temurin'
129129
java-version: 17
@@ -137,10 +137,10 @@ jobs:
137137
##needs: [scala3-library-bootstrapped] Add when we add support for caching here
138138
steps:
139139
- name: Git Checkout
140-
uses: actions/checkout@v4
140+
uses: actions/checkout@v5
141141

142142
- name: Set up JDK 17
143-
uses: actions/setup-java@v4
143+
uses: actions/setup-java@v5
144144
with:
145145
distribution: 'temurin'
146146
java-version: 17
@@ -154,10 +154,10 @@ jobs:
154154
##needs: [tasty-core-bootstrapped, scala3-library-bootstrapped] Add when we add support for caching here
155155
steps:
156156
- name: Git Checkout
157-
uses: actions/checkout@v4
157+
uses: actions/checkout@v5
158158

159159
- name: Set up JDK 17
160-
uses: actions/setup-java@v4
160+
uses: actions/setup-java@v5
161161
with:
162162
distribution: 'temurin'
163163
java-version: 17
@@ -171,10 +171,10 @@ jobs:
171171
##needs: [scala3-compiler-bootstrapped] Add when we add support for caching here
172172
steps:
173173
- name: Git Checkout
174-
uses: actions/checkout@v4
174+
uses: actions/checkout@v5
175175

176176
- name: Set up JDK 17
177-
uses: actions/setup-java@v4
177+
uses: actions/setup-java@v5
178178
with:
179179
distribution: 'temurin'
180180
java-version: 17
@@ -188,10 +188,10 @@ jobs:
188188
##needs: [scala3-compiler-bootstrapped] Add when we add support for caching here
189189
steps:
190190
- name: Git Checkout
191-
uses: actions/checkout@v4
191+
uses: actions/checkout@v5
192192

193193
- name: Set up JDK 17
194-
uses: actions/setup-java@v4
194+
uses: actions/setup-java@v5
195195
with:
196196
distribution: 'temurin'
197197
java-version: 17
@@ -205,10 +205,10 @@ jobs:
205205
##needs: [scala3-compiler-bootstrapped] Add when we add support for caching here
206206
steps:
207207
- name: Git Checkout
208-
uses: actions/checkout@v4
208+
uses: actions/checkout@v5
209209

210210
- name: Set up JDK 17
211-
uses: actions/setup-java@v4
211+
uses: actions/setup-java@v5
212212
with:
213213
distribution: 'temurin'
214214
java-version: 17
@@ -228,10 +228,10 @@ jobs:
228228
##needs: [scala3-sbt-bridge-nonbootstrapped] Add when we add support for caching here
229229
steps:
230230
- name: Git Checkout
231-
uses: actions/checkout@v4
231+
uses: actions/checkout@v5
232232

233233
- name: Set up JDK 17
234-
uses: actions/setup-java@v4
234+
uses: actions/setup-java@v5
235235
with:
236236
distribution: 'temurin'
237237
java-version: 17
@@ -245,10 +245,10 @@ jobs:
245245
##needs: [scala3-sbt-bridge-bootstrapped] Add when we add support for caching here
246246
steps:
247247
- name: Git Checkout
248-
uses: actions/checkout@v4
248+
uses: actions/checkout@v5
249249

250250
- name: Set up JDK 17
251-
uses: actions/setup-java@v4
251+
uses: actions/setup-java@v5
252252
with:
253253
distribution: 'temurin'
254254
java-version: 17
@@ -262,10 +262,10 @@ jobs:
262262
##needs: [tasty-core-nonbootstrapped] Add when we add support for caching here
263263
steps:
264264
- name: Git Checkout
265-
uses: actions/checkout@v4
265+
uses: actions/checkout@v5
266266

267267
- name: Set up JDK 17
268-
uses: actions/setup-java@v4
268+
uses: actions/setup-java@v5
269269
with:
270270
distribution: 'temurin'
271271
java-version: 17
@@ -279,10 +279,10 @@ jobs:
279279
##needs: [tasty-core-bootstrapped] Add when we add support for caching here
280280
steps:
281281
- name: Git Checkout
282-
uses: actions/checkout@v4
282+
uses: actions/checkout@v5
283283

284284
- name: Set up JDK 17
285-
uses: actions/setup-java@v4
285+
uses: actions/setup-java@v5
286286
with:
287287
distribution: 'temurin'
288288
java-version: 17

.github/workflows/test-chocolatey.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ jobs:
3030
test:
3131
runs-on: windows-latest
3232
steps:
33-
- uses: actions/setup-java@v4
33+
- uses: actions/setup-java@v5
3434
with:
3535
distribution: temurin
3636
java-version: ${{ inputs.java-version }}
3737
- name: Download the 'nupkg' from GitHub Artifacts
38-
uses: actions/download-artifact@v4
38+
uses: actions/download-artifact@v5
3939
with:
4040
name: scala.nupkg
4141
path: ${{ env.CHOCOLATEY-REPOSITORY }}

0 commit comments

Comments
 (0)