Skip to content

Commit 368095d

Browse files
committed
Merge branch 'main' into fix-18763
# Conflicts: # compiler/src/dotty/tools/dotc/typer/Typer.scala
2 parents 24b2dc7 + 42fdd76 commit 368095d

File tree

1,693 files changed

+114324
-8208
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,693 files changed

+114324
-8208
lines changed

.github/CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Any changes to the Scala 3 Standard Library must be approve
2+
# by one of the officers responsible of maintaining it
3+
/library/ @scala/stdlib-officers
4+
/library-aux/ @scala/stdlib-officers
5+
/library-js/ @scala/stdlib-officers

.github/ISSUE_TEMPLATE/bug.md

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,33 @@ assignees: ''
99

1010
## Compiler version
1111

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).
12+
If you're not sure which version you're using, run `print scalaVersion` from sbt.
13+
(If you're running scalac manually, use `scalac -version` instead.)
14+
15+
If possible, check if your issue appears in the nightly version of the compiler! For example, in Scala CLI (the `scala`/`scala-cli` runner script), you can use `//> using scala 3.nightly` (or `-S 3.nightly` from the command line) to grab the latest one.
1416

1517
## Minimized code
1618

1719
<!--
1820
This code should be self contained, compilable (with possible failures) and as small as possible.
1921
20-
Ideally, we should be able to just copy this code in a file and run `scalac` (and maybe `scala`) to reproduce the issue.
22+
Ideally, we should be able to just copy this code to a file and run `scalac` (and maybe `scala`) to reproduce the issue.
23+
24+
If the code has external dependencies, please provide the Scala CLI directives (or SBT/other build tool configuration) that describe them.
25+
Also note that it's easier and faster for the maintenance team to address issues minimised to reproduce bugs without external dependencies.
26+
27+
It's most convenient to also include `using` directives for the Scala version that demonstrates the problem,
28+
any compiler command-line options, as well as dependencies. An example is provided.
29+
30+
It's also fine to paste the transcript of a REPL session. Note that some bugs may be specific to the REPL.
2131
-->
2232

23-
```Scala
24-
println("hello, world")
33+
```scala
34+
//> using scala 3.7.0
35+
//> using options -Wall -Werror
36+
//> using dep com.outr::scribe:3.16.1
37+
38+
@main def test = println("hello, world")
2539
```
2640

2741
## Output

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ on:
2626
- cron: '0 3 * * *' # Every day at 3 AM
2727
workflow_dispatch:
2828

29-
# Cancels any in-progress runs within the same group identified by workflow name and GH reference (branch or tag)
29+
# Cancels any in-progress runs within the same group identified by workflow name and GH reference (branch or tag)
3030
# For example it would:
3131
# - terminate previous PR CI execution after pushing more changes to the same PR branch
32-
# - terminate previous on-push CI run after merging new PR to main
32+
# - terminate previous on-push CI run after merging new PR to main
3333
concurrency:
3434
group: ${{ github.workflow }}-${{ github.ref }}
3535
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
@@ -692,7 +692,7 @@ jobs:
692692
- name: Publish Nightly
693693
if: "steps.not_yet_published.outcome == 'success'"
694694
run: |
695-
./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonatypeBundleRelease"
695+
./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonaRelease"
696696
697697
nightly_documentation:
698698
runs-on: [self-hosted, Linux]
@@ -862,7 +862,7 @@ jobs:
862862
scala3-${{ env.RELEASE_TAG }}.msi
863863
864864
- name: Publish Release
865-
run: ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonatypeBundleUpload"
865+
run: ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonaUpload"
866866

867867

868868
open_issue_on_failure:

.github/workflows/cla.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
jobs:
77
check:
88
runs-on: ubuntu-latest
9+
if: github.event.pull_request.user.login != 'dependabot'
910
steps:
1011
- name: Verify CLA
1112
uses: scala/cla-checker@v1

.github/workflows/language-reference.yaml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,3 @@ jobs:
7070
fi
7171
cd ..
7272
73-
backport-to-main:
74-
name: Create pull request with backport to main
75-
permissions:
76-
pull-requests: write # for repo-sync/pull-request to create a PR
77-
runs-on: ubuntu-latest
78-
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
79-
steps:
80-
- uses: actions/checkout@v4
81-
- uses: repo-sync/pull-request@v2
82-
with:
83-
destination_branch: main
84-
pr_label: area:documentation
85-
pr_title: Sync with the stable documentation branch
86-
pr_body: |
87-
This pull request is syncing the main with changes from language-reference-stable.
88-
89-
It was created automatically after ${{ github.event.head_commit.id }} by @${{ github.event.head_commit.author.username }}
90-
pr_assignee: ${{ github.event.head_commit.author.username }}
91-

.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.7.1
19+
- uses: VirtusLab/scala-cli-setup@v1.8.4
2020
- run: scala-cli ./project/scripts/addToBackportingProject.scala -- ${{ github.sha }}
2121
env:
2222
GRAPHQL_API_TOKEN: ${{ secrets.GRAPHQL_API_TOKEN }}

.github/workflows/stdlib.yaml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Compile Full Standard Library
2+
3+
on:
4+
push:
5+
branches:
6+
- 'main'
7+
pull_request:
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
compile-nonbootstrapped:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Git Checkout
17+
uses: actions/checkout@v4
18+
19+
- name: Set up JDK 17
20+
uses: actions/setup-java@v4
21+
with:
22+
distribution: 'temurin'
23+
java-version: 17
24+
cache: 'sbt'
25+
26+
- uses: sbt/setup-sbt@v1
27+
- name: Compile `scala-library-nonbootstrapped`
28+
run: ./project/scripts/sbt scala-library-nonbootstrapped/compile
29+
30+
compile-bootstrapped:
31+
runs-on: ubuntu-latest
32+
steps:
33+
- name: Git Checkout
34+
uses: actions/checkout@v4
35+
36+
- name: Set up JDK 17
37+
uses: actions/setup-java@v4
38+
with:
39+
distribution: 'temurin'
40+
java-version: 17
41+
cache: 'sbt'
42+
43+
- uses: sbt/setup-sbt@v1
44+
- name: Compile `scala-library-bootstrapped`
45+
run: ./project/scripts/sbt scala-library-bootstrapped/compile
46+

build.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ val `scala3-bootstrapped` = Build.`scala3-bootstrapped`
33
val `scala3-interfaces` = Build.`scala3-interfaces`
44
val `scala3-compiler` = Build.`scala3-compiler`
55
val `scala3-compiler-bootstrapped` = Build.`scala3-compiler-bootstrapped`
6+
val `scala-library-nonbootstrapped` = Build.`scala-library-nonbootstrapped`
7+
val `scala-library-bootstrapped` = Build.`scala-library-bootstrapped`
68
val `scala3-library` = Build.`scala3-library`
79
val `scala3-library-bootstrapped` = Build.`scala3-library-bootstrapped`
810
val `scala3-library-bootstrappedJS` = Build.`scala3-library-bootstrappedJS`

0 commit comments

Comments
 (0)