Skip to content

Commit 473897c

Browse files
KordyjanKordyjan
committed
Merge branch 'release-3.4.2' into language-reference-stable
2 parents 1205601 + 0f7f990 commit 473897c

File tree

577 files changed

+11372
-3344
lines changed

Some content is hidden

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

577 files changed

+11372
-3344
lines changed

‎.github/workflows/ci.yaml

+59-26
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
test_non_bootstrapped:
4848
runs-on: [self-hosted, Linux]
4949
container:
50-
image: lampepfl/dotty:2021-03-22
50+
image: lampepfl/dotty:2023-11-07
5151
options: --cpu-shares 4096
5252
volumes:
5353
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -65,8 +65,8 @@ jobs:
6565
&& github.repository == 'scala/scala3'
6666
)"
6767
steps:
68-
- name: Set JDK 16 as default
69-
run: echo "/usr/lib/jvm/java-16-openjdk-amd64/bin" >> $GITHUB_PATH
68+
- name: Set JDK 17 as default
69+
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
7070

7171
## Workaround for https://github.com/actions/runner/issues/2033 (See https://github.com/scala/scala3/pull/19720)
7272
- name: Reset existing repo
@@ -99,7 +99,7 @@ jobs:
9999
test:
100100
runs-on: [self-hosted, Linux]
101101
container:
102-
image: lampepfl/dotty:2021-03-22
102+
image: lampepfl/dotty:2023-11-07
103103
options: --cpu-shares 4096
104104
volumes:
105105
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -119,8 +119,8 @@ jobs:
119119
)"
120120

121121
steps:
122-
- name: Set JDK 16 as default
123-
run: echo "/usr/lib/jvm/java-16-openjdk-amd64/bin" >> $GITHUB_PATH
122+
- name: Set JDK 17 as default
123+
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
124124

125125
- name: Reset existing repo
126126
run: |
@@ -141,7 +141,7 @@ jobs:
141141

142142
- name: Cmd Tests
143143
run: |
144-
./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/*; scala2-library-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
144+
./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/*; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
145145
./project/scripts/cmdTests
146146
./project/scripts/bootstrappedOnlyCmdTests
147147
@@ -153,12 +153,12 @@ jobs:
153153
run: ./project/scripts/sbt ";set ThisBuild/Build.scala2Library := Build.Scala2LibraryTasty ;scala3-bootstrapped/testCompilation i5; scala3-bootstrapped/testCompilation tests/run/typelevel-peano.scala; scala3-bootstrapped/testOnly dotty.tools.backend.jvm.DottyBytecodeTests" # only test a subset of test to avoid doubling the CI execution time
154154

155155
- name: Test with Scala 2 library with CC TASTy (fast)
156-
run: ./project/scripts/sbt "scala2-library-cc/compile; scala2-library-cc-tasty/compile; scala3-bootstrapped/testCompilation i3"
156+
run: ./project/scripts/sbt ";set ThisBuild/Build.scala2Library := Build.Scala2LibraryCCTasty; scala2-library-cc/compile; scala2-library-cc-tasty/compile; scala3-bootstrapped/testCompilation i3"
157157

158158
test_scala2_library_tasty:
159159
runs-on: [self-hosted, Linux]
160160
container:
161-
image: lampepfl/dotty:2021-03-22
161+
image: lampepfl/dotty:2023-11-07
162162
options: --cpu-shares 4096
163163
volumes:
164164
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -175,8 +175,8 @@ jobs:
175175
)"
176176

177177
steps:
178-
- name: Set JDK 16 as default
179-
run: echo "/usr/lib/jvm/java-16-openjdk-amd64/bin" >> $GITHUB_PATH
178+
- name: Set JDK 17 as default
179+
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
180180

181181
- name: Reset existing repo
182182
run: |
@@ -198,9 +198,8 @@ jobs:
198198
- name: Test with Scala 2 library TASTy
199199
run: ./project/scripts/sbt ";set ThisBuild/Build.scala2Library := Build.Scala2LibraryTasty ;scala3-bootstrapped/test"
200200

201-
# TODO test all the test configurations in non-CC library (currently disabled due to bug while loading the library)
202-
# - name: Test with Scala 2 library with CC TASTy
203-
# run: ./project/scripts/sbt ";set ThisBuild/Build.scala2Library := Build.Scala2LibraryCCTasty ;scala3-bootstrapped/test"
201+
- name: Test with Scala 2 library with CC TASTy
202+
run: ./project/scripts/sbt ";set ThisBuild/Build.scala2Library := Build.Scala2LibraryCCTasty ;scala3-bootstrapped/test"
204203

205204

206205
test_windows_fast:
@@ -227,7 +226,7 @@ jobs:
227226
uses: actions/checkout@v4
228227

229228
- name: Test
230-
run: sbt ";scala3-bootstrapped/compile"
229+
run: sbt ";scala3-bootstrapped/compile; scala3-bootstrapped/testCompilation"
231230
shell: cmd
232231

233232
- name: build binary
@@ -282,7 +281,7 @@ jobs:
282281
name: MiMa
283282
runs-on: [self-hosted, Linux]
284283
container:
285-
image: lampepfl/dotty:2021-03-22
284+
image: lampepfl/dotty:2023-11-07
286285
options: --cpu-shares 4096
287286
volumes:
288287
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -301,6 +300,9 @@ jobs:
301300
&& github.repository == 'scala/scala3'
302301
)"
303302
steps:
303+
- name: Set JDK 17 as default
304+
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
305+
304306
- name: Reset existing repo
305307
run: |
306308
git config --global --add safe.directory /__w/scala3/scala3
@@ -330,7 +332,7 @@ jobs:
330332
community_build_a:
331333
runs-on: [self-hosted, Linux]
332334
container:
333-
image: lampepfl/dotty:2021-03-22
335+
image: lampepfl/dotty:2023-11-07
334336
options: --cpu-shares 4096
335337
volumes:
336338
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -351,6 +353,11 @@ jobs:
351353
)"
352354

353355
steps:
356+
######################################################################################
357+
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA IS DISTRIBUTED USING JAVA 8. ##
358+
######################################################################################
359+
- name: Set JDK 8 as default
360+
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
354361
- name: Reset existing repo
355362
run: |
356363
git config --global --add safe.directory /__w/scala3/scala3
@@ -382,7 +389,7 @@ jobs:
382389
community_build_b:
383390
runs-on: [self-hosted, Linux]
384391
container:
385-
image: lampepfl/dotty:2021-03-22
392+
image: lampepfl/dotty:2023-11-07
386393
options: --cpu-shares 4096
387394
volumes:
388395
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -403,6 +410,11 @@ jobs:
403410
)"
404411

405412
steps:
413+
######################################################################################
414+
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA IS DISTRIBUTED USING JAVA 8. ##
415+
######################################################################################
416+
- name: Set JDK 8 as default
417+
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
406418
- name: Reset existing repo
407419
run: |
408420
git config --global --add safe.directory /__w/scala3/scala3
@@ -434,7 +446,7 @@ jobs:
434446
community_build_c:
435447
runs-on: [self-hosted, Linux]
436448
container:
437-
image: lampepfl/dotty:2020-11-19
449+
image: lampepfl/dotty:2023-11-07
438450
options: --cpu-shares 4096
439451
volumes:
440452
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -455,6 +467,11 @@ jobs:
455467
)"
456468

457469
steps:
470+
######################################################################################
471+
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA IS DISTRIBUTED USING JAVA 8. ##
472+
######################################################################################
473+
- name: Set JDK 8 as default
474+
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
458475
- name: Reset existing repo
459476
run: |
460477
git config --global --add safe.directory /__w/scala3/scala3
@@ -486,7 +503,7 @@ jobs:
486503
test_sbt:
487504
runs-on: [self-hosted, Linux]
488505
container:
489-
image: lampepfl/dotty:2021-03-22
506+
image: lampepfl/dotty:2023-11-07
490507
options: --cpu-shares 4096
491508
volumes:
492509
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -505,6 +522,9 @@ jobs:
505522
)"
506523

507524
steps:
525+
- name: Set JDK 17 as default
526+
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
527+
508528
- name: Reset existing repo
509529
run: |
510530
git config --global --add safe.directory /__w/scala3/scala3
@@ -528,7 +548,7 @@ jobs:
528548
test_java8:
529549
runs-on: [self-hosted, Linux]
530550
container:
531-
image: lampepfl/dotty:2021-03-22
551+
image: lampepfl/dotty:2023-11-07
532552
options: --cpu-shares 4096
533553
volumes:
534554
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -551,6 +571,9 @@ jobs:
551571
)"
552572

553573
steps:
574+
####################################################################################
575+
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. THIS TEST IS SPECIFIC FOR JAVA 8 ##
576+
####################################################################################
554577
- name: Set JDK 8 as default
555578
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
556579

@@ -573,7 +596,7 @@ jobs:
573596

574597
- name: Test
575598
run: |
576-
./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/*; scala2-library-tasty-tests/test"
599+
./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/*"
577600
./project/scripts/cmdTests
578601
./project/scripts/bootstrappedOnlyCmdTests
579602
@@ -584,7 +607,7 @@ jobs:
584607
publish_nightly:
585608
runs-on: [self-hosted, Linux]
586609
container:
587-
image: lampepfl/dotty:2021-03-22
610+
image: lampepfl/dotty:2023-11-07
588611
options: --cpu-shares 4096
589612
volumes:
590613
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -600,6 +623,11 @@ jobs:
600623
SONATYPE_USER: ${{ secrets.SONATYPE_USER_ORGSCALALANG }}
601624

602625
steps:
626+
######################################################################################
627+
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA IS DISTRIBUTED USING JAVA 8. ##
628+
######################################################################################
629+
- name: Set JDK 8 as default
630+
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
603631
- name: Reset existing repo
604632
run: |
605633
git config --global --add safe.directory /__w/scala3/scala3
@@ -637,7 +665,7 @@ jobs:
637665
nightly_documentation:
638666
runs-on: [self-hosted, Linux]
639667
container:
640-
image: lampepfl/dotty:2021-03-22
668+
image: lampepfl/dotty:2023-11-07
641669
options: --cpu-shares 4096
642670
volumes:
643671
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -691,7 +719,7 @@ jobs:
691719
contents: write # for actions/create-release to create a release
692720
runs-on: [self-hosted, Linux]
693721
container:
694-
image: lampepfl/dotty:2021-03-22
722+
image: lampepfl/dotty:2023-11-07
695723
options: --cpu-shares 4096
696724
volumes:
697725
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -709,6 +737,11 @@ jobs:
709737
SONATYPE_USER: ${{ secrets.SONATYPE_USER_ORGSCALALANG }}
710738

711739
steps:
740+
######################################################################################
741+
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA IS DISTRIBUTED USING JAVA 8. ##
742+
######################################################################################
743+
- name: Set JDK 8 as default
744+
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
712745
- name: Reset existing repo
713746
run: |
714747
git config --global --add safe.directory /__w/scala3/scala3
@@ -781,7 +814,7 @@ jobs:
781814
open_issue_on_failure:
782815
runs-on: [self-hosted, Linux]
783816
container:
784-
image: lampepfl/dotty:2021-03-22
817+
image: lampepfl/dotty:2023-11-07
785818
needs: [nightly_documentation, test_windows_full]
786819
# The `failure()` expression is true iff at least one of the dependencies
787820
# of this job (including transitive dependencies) has failed.

‎.github/workflows/lts-backport.yaml

+1-1
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.1.2
18+
- uses: VirtusLab/scala-cli-setup@v1.2.0
1919
- run: scala-cli ./project/scripts/addToBackportingProject.scala -- ${{ github.sha }}
2020
env:
2121
GRAPHQL_API_TOKEN: ${{ secrets.GRAPHQL_API_TOKEN }}

‎.github/workflows/spec.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
env:
4646
USER_FOR_TEST: ${{ secrets.SPEC_DEPLOY_USER }}
4747
if: ${{ env.USER_FOR_TEST != '' }}
48-
uses: burnett01/rsync-deployments@6.0.0
48+
uses: burnett01/rsync-deployments@7.0.0
4949
with:
5050
switches: -rzv
5151
path: docs/_spec/_site/

‎.gitignore

-4
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,3 @@ docs/_spec/.jekyll-metadata
9999

100100
# scaladoc related
101101
scaladoc/output/
102-
103-
#coverage
104-
coverage/
105-

‎MAINTENANCE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ The following is the list of all the principal areas of the compiler and the cor
9494
- Linting (especially unused warnings) / Reporting UX: @szymon-rd
9595

9696
### Infrastructure
97-
- CI: @anatoliykmetyuk
98-
- Community Build: @anatoliykmetyuk
97+
- CI: @hamzaremmal
98+
- Community Build: @hamzaremmal
9999
- Open Community Build: @WojciechMazur
100100
- Vulpix: @dwijnand, @prolativ
101101
- Benchmarks: @mbovel

‎build.sbt

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ val `scala3-bench-bootstrapped` = Build.`scala3-bench-bootstrapped`
1616
val `scala3-bench-micro` = Build.`scala3-bench-micro`
1717
val `scala2-library-bootstrapped` = Build.`scala2-library-bootstrapped`
1818
val `scala2-library-tasty` = Build.`scala2-library-tasty`
19-
val `scala2-library-tasty-tests` = Build.`scala2-library-tasty-tests`
2019
val `scala2-library-cc` = Build.`scala2-library-cc`
2120
val `scala2-library-cc-tasty` = Build.`scala2-library-cc-tasty`
2221
val `tasty-core` = Build.`tasty-core`

0 commit comments

Comments
 (0)