Skip to content

Commit 1205601

Browse files
committed
Merge branch 'release-3.4.1' into language-reference-stable
2 parents 18c69f6 + 3ffe322 commit 1205601

File tree

1,240 files changed

+13123
-5798
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,240 files changed

+13123
-5798
lines changed

.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/discussions/new?category=feature-requests
3+
about: Please create a feature request here https://github.com/scala/scala3/discussions/new?category=feature-requests
44
title: ''
55
labels: ''
66
assignees: ''
77

88
---
99

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

.github/ISSUE_TEMPLATE/improve-error.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This code should be self-contained, reproducible (i.e. produces the expected err
1919
2020
Ideally, we should be able to just copy this code in a file and run `scalac` (and maybe `scala`) to reproduce the issue.
2121
22-
For a good example, see https://github.com/lampepfl/dotty/issues/18657
22+
For a good example, see https://github.com/scala/scala3/issues/18657
2323
-->
2424

2525
```Scala
@@ -44,12 +44,12 @@ for example:
4444

4545
## Why this Error/Warning was not helpful
4646

47-
<!-- For a good example, see https://github.com/lampepfl/dotty/issues/18657 -->
47+
<!-- For a good example, see https://github.com/scala/scala3/issues/18657 -->
4848

4949
The message was unhelpful because...
5050

5151
## Suggested improvement
5252

53-
<!-- For a good example, see https://github.com/lampepfl/dotty/issues/18657 -->
53+
<!-- For a good example, see https://github.com/scala/scala3/issues/18657 -->
5454

5555
It could be made more helpful by...

.github/workflows/ci.yaml

Lines changed: 79 additions & 39 deletions
Large diffs are not rendered by default.

.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/[email protected].0
18+
- uses: VirtusLab/[email protected].2
1919
- run: scala-cli ./project/scripts/addToBackportingProject.scala -- ${{ github.sha }}
2020
env:
2121
GRAPHQL_API_TOKEN: ${{ secrets.GRAPHQL_API_TOKEN }}

.github/workflows/releases.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ jobs:
1818

1919
steps:
2020
- name: Reset existing repo
21-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
21+
run: |
22+
git config --global --add safe.directory /__w/dotty/dotty
23+
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
2224
2325
- name: Cleanup
2426
run: .github/workflows/cleanup.sh

.github/workflows/scripts/publish-sdkman.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
set -u
1111

1212
# latest stable dotty version
13-
DOTTY_VERSION=$(curl -s https://api.github.com/repos/lampepfl/dotty/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
14-
DOTTY_URL="https://github.com/lampepfl/dotty/releases/download/$DOTTY_VERSION/scala3-$DOTTY_VERSION.zip"
13+
DOTTY_VERSION=$(curl -s https://api.github.com/repos/scala/scala3/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
14+
DOTTY_URL="https://github.com/scala/scala3/releases/download/$DOTTY_VERSION/scala3-$DOTTY_VERSION.zip"
1515

1616
# checking if dotty version is available
1717
if ! curl --output /dev/null --silent --head --fail "$DOTTY_URL"; then

MAINTENANCE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ The issue supervisor is responsible for:
1515
- Modifying issue labels to best capture information about the issues
1616
- Attempting to reproduce the issue (or label “stat:cannot reproduce”)
1717
- Further minimizing the issue or asking the reporter of the issue to minimize it correctly (or label “stat:needs minimization”)
18-
- Identifying which issues are of considerable importance and bringing them to the attention of the team during the Dotty meeting, where they can be filtered and added to the [Future Versions](https://github.com/lampepfl/dotty/milestone/46) milestone.
18+
- Identifying which issues are of considerable importance and bringing them to the attention of the team during the Dotty meeting, where they can be filtered and added to the [Future Versions](https://github.com/scala/scala3/milestone/46) milestone.
1919
- Identifying if a report is really a feature request and if so, converting it to
20-
a [feature request discussion](https://github.com/lampepfl/dotty/discussions/categories/feature-requests).
20+
a [feature request discussion](https://github.com/scala/scala3/discussions/categories/feature-requests).
2121
- Keeping an eye on new
22-
[discussions](https://github.com/lampepfl/dotty/discussions), making sure they
22+
[discussions](https://github.com/scala/scala3/discussions), making sure they
2323
don't go unanswered and also correctly labeling new feature requests.
2424

2525
Other core teammates are responsible for providing information to the issue supervisor in a timely manner when it is requested if they have that information.

NOTICE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Dotty (https://dotty.epfl.ch)
2-
Copyright 2012-2023 EPFL
3-
Copyright 2012-2023 Lightbend, Inc.
2+
Copyright 2012-2024 EPFL
3+
Copyright 2012-2024 Lightbend, Inc.
44

55
Licensed under the Apache License, Version 2.0 (the "License"):
66
http://www.apache.org/licenses/LICENSE-2.0
@@ -104,4 +104,4 @@ major authors were omitted by oversight.
104104
[3] https://github.com/sbt/sbt/tree/0.13/compile/interface/src/main/scala/xsbt
105105
[4] https://github.com/scoverage/scalac-scoverage-plugin
106106
[5] https://github.com/scalameta/metals
107-
[6] https://github.com/lampepfl/dotty/pull/5783/files
107+
[6] https://github.com/scala/scala3/pull/5783/files

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Dotty
22
=====
3-
[![Dotty CI](https://github.com/lampepfl/dotty/workflows/Dotty/badge.svg?branch=master)](https://github.com/lampepfl/dotty/actions?query=branch%3Amain)
3+
[![Dotty CI](https://github.com/scala/scala3/workflows/Dotty/badge.svg?branch=master)](https://github.com/scala/scala3/actions?query=branch%3Amain)
44
[![Join the chat at https://discord.com/invite/scala](https://img.shields.io/discord/632150470000902164)](https://discord.com/invite/scala)
55

66
* [Documentation](https://docs.scala-lang.org/scala3/)
@@ -23,7 +23,7 @@ other more direct lines of communication such as email.
2323
How to Contribute
2424
=================
2525
* [Getting Started as Contributor](https://docs.scala-lang.org/scala3/guides/contribution/contribution-intro.html)
26-
* [Issues](https://github.com/lampepfl/dotty/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
26+
* [Issues](https://github.com/scala/scala3/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
2727

2828
License
2929
=======

bench/profiles/compiletime.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
charts:
22

33
- name: "Compile-time sums of constant integer types (generated)"
4-
url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
4+
url: https://github.com/scala/scala3/blob/main/bench/src/main/scala/generateBenchmarks.scala
55
lines:
66
- key: compiletime-sum-constants
77
label: bootstrapped
88

99
- name: "Compile-time sums of term reference types (generated)"
10-
url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
10+
url: https://github.com/scala/scala3/blob/main/bench/src/main/scala/generateBenchmarks.scala
1111
lines:
1212
- key: compiletime-sum-termrefs
1313
label: bootstrapped
1414

1515
- name: "Sums of term references, result type inferred (generated)"
16-
url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
16+
url: https://github.com/scala/scala3/blob/main/bench/src/main/scala/generateBenchmarks.scala
1717
lines:
1818
- key: compiletime-sum-termrefs-terms
1919
label: bootstrapped
2020

2121
- name: "Compile-time sums of type applications (generated)"
22-
url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
22+
url: https://github.com/scala/scala3/blob/main/bench/src/main/scala/generateBenchmarks.scala
2323
lines:
2424
- key: compiletime-sum-applications
2525
label: bootstrapped
2626

2727
- name: "Compile-time additions inside multiplications (generated)"
28-
url: https://github.com/lampepfl/dotty/blob/main/bench/src/main/scala/generateBenchmarks.scala
28+
url: https://github.com/scala/scala3/blob/main/bench/src/main/scala/generateBenchmarks.scala
2929
lines:
3030
- key: compiletime-distribute
3131
label: bootstrapped
@@ -48,4 +48,4 @@ scripts:
4848
- measure 6 6 7 1 $PROG_HOME/dotty/bench/tests-generated/compiletime-ops/distribute.scala
4949

5050
config:
51-
pr_base_url: "https://github.com/lampepfl/dotty/pull/"
51+
pr_base_url: "https://github.com/scala/scala3/pull/"

0 commit comments

Comments
 (0)