Skip to content

Commit 1eac8fb

Browse files
KordyjanKordyjan
committed
Merge branch 'release-3.4.0' into language-reference-stable
2 parents 97138fb + a92a463 commit 1eac8fb

File tree

3,322 files changed

+138050
-22852
lines changed

Some content is hidden

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

3,322 files changed

+138050
-22852
lines changed

‎.github/ISSUE_TEMPLATE/crash.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ println("hello, world")
2525
```
2626

2727
## Output (click arrow to expand)
28+
<!--
29+
Note: to get a full crash log when using scala-cli, run compilation with the flag `--server=false`
30+
-->
2831
<details>
2932

3033
```scala

‎.github/ISSUE_TEMPLATE/feature.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
name: "\U0001F389 Suggest a feature"
3-
about: Please create a feature request here https://github.com/lampepfl/dotty-feature-requests
3+
about: Please create a feature request here https://github.com/lampepfl/dotty/discussions/new?category=feature-requests
44
title: ''
55
labels: ''
66
assignees: ''
77

88
---
99

10-
Please create a feature request here: [lampepfl/dotty-feature-requests](https://github.com/lampepfl/dotty-feature-requests).
10+
Please create a feature request in the [Dotty Discussions](https://github.com/lampepfl/dotty/discussions/new?category=feature-requests).

‎.github/ISSUE_TEMPLATE/improve-error.md

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
---
2+
name: "\U0001F615 Error/Warning message report"
3+
about: Report an error/warning message that was confusing/unhelpful
4+
title: ''
5+
labels: itype:enhancement, area:reporting, better-errors, stat:needs triage
6+
assignees: ''
7+
8+
---
9+
10+
## Compiler version
11+
12+
If you're not sure what version you're using, run `print scalaVersion` from sbt
13+
(if you're running scalac manually, use `scalac -version` instead).
14+
15+
## Minimized example
16+
17+
<!--
18+
This code should be self-contained, reproducible (i.e. produces the expected error/warning message) and as small as possible.
19+
20+
Ideally, we should be able to just copy this code in a file and run `scalac` (and maybe `scala`) to reproduce the issue.
21+
22+
For a good example, see https://github.com/lampepfl/dotty/issues/18657
23+
-->
24+
25+
```Scala
26+
printl("hello, world")
27+
```
28+
29+
## Output Error/Warning message
30+
31+
<!--
32+
Here, please provide the produced error/warning message that is confusing/unhelpful, etc.
33+
34+
for example:
35+
-->
36+
37+
```scala
38+
-- [E006] Not Found Error: ----------------
39+
1 |printl("hello, world")
40+
|^^^^^^
41+
|Not found: printl
42+
1 error found
43+
```
44+
45+
## Why this Error/Warning was not helpful
46+
47+
<!-- For a good example, see https://github.com/lampepfl/dotty/issues/18657 -->
48+
49+
The message was unhelpful because...
50+
51+
## Suggested improvement
52+
53+
<!-- For a good example, see https://github.com/lampepfl/dotty/issues/18657 -->
54+
55+
It could be made more helpful by...

‎.github/workflows/ci.yaml

Lines changed: 80 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ on:
1818
- '*'
1919
branches-ignore:
2020
- 'gh-readonly-queue/**'
21+
- 'release-**'
22+
- 'lts-**'
2123
pull_request:
2224
merge_group:
2325
schedule:
@@ -70,13 +72,13 @@ jobs:
7072
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
7173

7274
- name: Checkout cleanup script
73-
uses: actions/checkout@v3
75+
uses: actions/checkout@v4
7476

7577
- name: Cleanup
7678
run: .github/workflows/cleanup.sh
7779

7880
- name: Git Checkout
79-
uses: actions/checkout@v3
81+
uses: actions/checkout@v4
8082

8183
- name: Add SBT proxy repositories
8284
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -121,27 +123,72 @@ jobs:
121123
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
122124

123125
- name: Checkout cleanup script
124-
uses: actions/checkout@v3
126+
uses: actions/checkout@v4
125127

126128
- name: Cleanup
127129
run: .github/workflows/cleanup.sh
128130

129131
- name: Git Checkout
130-
uses: actions/checkout@v3
132+
uses: actions/checkout@v4
131133

132134
- name: Add SBT proxy repositories
133135
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
134136

135137
- name: Cmd Tests
136138
run: |
137-
./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
139+
./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;scala2-library-tasty-tests/run ;scala2-library-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
138140
./project/scripts/cmdTests
139141
./project/scripts/bootstrappedOnlyCmdTests
140142
141143
- name: Scala.js Test
142144
run: |
143145
./project/scripts/sbt ";sjsSandbox/run ;sjsSandbox/test ;sjsJUnitTests/test ;set sjsJUnitTests/scalaJSLinkerConfig ~= switchToESModules ;sjsJUnitTests/test ;sjsCompilerTests/test"
144146
147+
- name: Test with Scala 2 library TASTy (fast)
148+
run: ./project/scripts/sbt ";set ThisBuild/Build.useScala2LibraryTasty := true ;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
149+
150+
test_scala2_library_tasty:
151+
runs-on: [self-hosted, Linux]
152+
container:
153+
image: lampepfl/dotty:2021-03-22
154+
options: --cpu-shares 4096
155+
volumes:
156+
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
157+
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
158+
- ${{ github.workspace }}/../../cache/general:/root/.cache
159+
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
160+
|| (
161+
github.event_name == 'pull_request'
162+
&& contains(github.event.pull_request.body, '[test_scala2_library_tasty]')
163+
)
164+
|| (
165+
github.event_name == 'workflow_dispatch'
166+
&& github.repository == 'lampepfl/dotty'
167+
)"
168+
169+
steps:
170+
- name: Set JDK 16 as default
171+
run: echo "/usr/lib/jvm/java-16-openjdk-amd64/bin" >> $GITHUB_PATH
172+
173+
- name: Reset existing repo
174+
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
175+
176+
- name: Checkout cleanup script
177+
uses: actions/checkout@v4
178+
179+
- name: Cleanup
180+
run: .github/workflows/cleanup.sh
181+
182+
- name: Git Checkout
183+
uses: actions/checkout@v4
184+
185+
- name: Add SBT proxy repositories
186+
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
187+
188+
- name: Test with Scala 2 library TASTy
189+
run: ./project/scripts/sbt ";set ThisBuild/Build.useScala2LibraryTasty := true ;scala3-bootstrapped/test"
190+
191+
145192
test_windows_fast:
146193
runs-on: [self-hosted, Windows]
147194
if: "(
@@ -161,7 +208,7 @@ jobs:
161208
shell: cmd
162209

163210
- name: Git Checkout
164-
uses: actions/checkout@v3
211+
uses: actions/checkout@v4
165212

166213
- name: Test
167214
run: sbt ";scala3-bootstrapped/compile"
@@ -203,7 +250,7 @@ jobs:
203250
shell: cmd
204251

205252
- name: Git Checkout
206-
uses: actions/checkout@v3
253+
uses: actions/checkout@v4
207254

208255
- name: Test
209256
run: sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test"
@@ -240,20 +287,25 @@ jobs:
240287
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
241288

242289
- name: Checkout cleanup script
243-
uses: actions/checkout@v3
290+
uses: actions/checkout@v4
244291

245292
- name: Cleanup
246293
run: .github/workflows/cleanup.sh
247294

248295
- name: Git Checkout
249-
uses: actions/checkout@v3
296+
uses: actions/checkout@v4
250297

251298
- name: Add SBT proxy repositories
252299
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
253300

254301
- name: MiMa
255302
run: |
256-
./project/scripts/sbt ";scala3-interfaces/mimaReportBinaryIssues ;scala3-library-bootstrapped/mimaReportBinaryIssues ;scala3-library-bootstrappedJS/mimaReportBinaryIssues; tasty-core-bootstrapped/mimaReportBinaryIssues"
303+
./project/scripts/sbt ";scala3-interfaces/mimaReportBinaryIssues ;scala3-library-bootstrapped/mimaReportBinaryIssues ;scala3-library-bootstrappedJS/mimaReportBinaryIssues; tasty-core-bootstrapped/mimaReportBinaryIssues; scala2-library-bootstrapped/mimaReportBinaryIssues"
304+
305+
- name: TASTy MiMa
306+
run: |
307+
# This script cleans the compiler and recompiles it from scratch (keep as last run)
308+
./project/scripts/scala2-library-tasty-mima.sh
257309
258310
community_build_a:
259311
runs-on: [self-hosted, Linux]
@@ -283,13 +335,13 @@ jobs:
283335
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
284336

285337
- name: Checkout cleanup script
286-
uses: actions/checkout@v3
338+
uses: actions/checkout@v4
287339

288340
- name: Cleanup
289341
run: .github/workflows/cleanup.sh
290342

291343
- name: Git Checkout
292-
uses: actions/checkout@v3
344+
uses: actions/checkout@v4
293345

294346
- name: Add SBT proxy repositories
295347
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -332,13 +384,13 @@ jobs:
332384
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
333385

334386
- name: Checkout cleanup script
335-
uses: actions/checkout@v3
387+
uses: actions/checkout@v4
336388

337389
- name: Cleanup
338390
run: .github/workflows/cleanup.sh
339391

340392
- name: Git Checkout
341-
uses: actions/checkout@v3
393+
uses: actions/checkout@v4
342394

343395
- name: Add SBT proxy repositories
344396
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -381,13 +433,13 @@ jobs:
381433
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
382434

383435
- name: Checkout cleanup script
384-
uses: actions/checkout@v3
436+
uses: actions/checkout@v4
385437

386438
- name: Cleanup
387439
run: .github/workflows/cleanup.sh
388440

389441
- name: Git Checkout
390-
uses: actions/checkout@v3
442+
uses: actions/checkout@v4
391443

392444
- name: Add SBT proxy repositories
393445
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -428,13 +480,13 @@ jobs:
428480
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
429481

430482
- name: Checkout cleanup script
431-
uses: actions/checkout@v3
483+
uses: actions/checkout@v4
432484

433485
- name: Cleanup
434486
run: .github/workflows/cleanup.sh
435487

436488
- name: Git Checkout
437-
uses: actions/checkout@v3
489+
uses: actions/checkout@v4
438490

439491
- name: Add SBT proxy repositories
440492
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -475,20 +527,20 @@ jobs:
475527
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
476528

477529
- name: Checkout cleanup script
478-
uses: actions/checkout@v3
530+
uses: actions/checkout@v4
479531

480532
- name: Cleanup
481533
run: .github/workflows/cleanup.sh
482534

483535
- name: Git Checkout
484-
uses: actions/checkout@v3
536+
uses: actions/checkout@v4
485537

486538
- name: Add SBT proxy repositories
487539
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
488540

489541
- name: Test
490542
run: |
491-
./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test"
543+
./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;scala2-library-tasty-tests/run ;scala2-library-tasty-tests/test"
492544
./project/scripts/cmdTests
493545
./project/scripts/bootstrappedOnlyCmdTests
494546
@@ -519,13 +571,13 @@ jobs:
519571
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
520572

521573
- name: Checkout cleanup script
522-
uses: actions/checkout@v3
574+
uses: actions/checkout@v4
523575

524576
- name: Cleanup
525577
run: .github/workflows/cleanup.sh
526578

527579
- name: Git Checkout
528-
uses: actions/checkout@v3
580+
uses: actions/checkout@v4
529581

530582
- name: Add SBT proxy repositories
531583
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -573,13 +625,13 @@ jobs:
573625
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
574626

575627
- name: Checkout cleanup script
576-
uses: actions/checkout@v3
628+
uses: actions/checkout@v4
577629

578630
- name: Cleanup
579631
run: .github/workflows/cleanup.sh
580632

581633
- name: Git Checkout
582-
uses: actions/checkout@v3
634+
uses: actions/checkout@v4
583635

584636
- name: Add SBT proxy repositories
585637
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -623,13 +675,13 @@ jobs:
623675
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
624676

625677
- name: Checkout cleanup script
626-
uses: actions/checkout@v3
678+
uses: actions/checkout@v4
627679

628680
- name: Cleanup
629681
run: .github/workflows/cleanup.sh
630682

631683
- name: Git Checkout
632-
uses: actions/checkout@v3
684+
uses: actions/checkout@v4
633685

634686
- name: Add SBT proxy repositories
635687
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
@@ -696,7 +748,7 @@ jobs:
696748
if: "failure() && github.event_name == 'schedule'"
697749
steps:
698750
- name: Checkout issue template
699-
uses: actions/checkout@v3
751+
uses: actions/checkout@v4
700752

701753
- name: Open an issue
702754
uses: JasonEtco/create-an-issue@v2

‎.github/workflows/cla.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
check:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- run: ./project/scripts/check-cla.sh
2020
if: github.event_name == 'pull_request'
2121
env:

‎.github/workflows/dependency-graph.yml

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

0 commit comments

Comments
 (0)