Skip to content

Commit 53ed810

Browse files
authored
Merge branch 'scala:main' into discussion-18903
2 parents 3a54136 + 9eb843d commit 53ed810

File tree

4,354 files changed

+169586
-66628
lines changed

Some content is hidden

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

4,354 files changed

+169586
-66628
lines changed

.git-blame-ignore-revs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
46a26945a172429740ebdd1fc83517130670080b

.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/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ RUN apt-get update && \
2222
# Install sbt
2323
ENV SBT_HOME /usr/local/sbt
2424
ENV PATH ${SBT_HOME}/bin:${PATH}
25-
ENV SBT_VERSION 1.9.0
25+
ENV SBT_VERSION 1.10.7
2626
RUN curl -sL "https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz" | gunzip | tar -x -C /usr/local

.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/PULL_REQUEST_TEMPLATE/fix-issue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ assignees: ''
88

99
<!--
1010
TODO first sign the CLA
11-
https://www.lightbend.com/contribute/cla/scala
11+
https://contribute.akka.io/cla/scala
1212
-->
1313

1414
## Fix #XYZ

.github/PULL_REQUEST_TEMPLATE/other-pr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ assignees: ''
88

99
<!--
1010
TODO first sign the CLA
11-
https://www.lightbend.com/contribute/cla/scala
11+
https://contribute.akka.io/cla/scala
1212
-->
1313

1414
## Description

.github/workflows/build-chocolatey.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
build:
2828
runs-on: windows-latest
2929
steps:
30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v6
3131
- name: Replace the version placeholder
3232
uses: richardrigutins/replace-in-files@v2
3333
with:
@@ -49,7 +49,7 @@ jobs:
4949
- name: Build the Chocolatey package (.nupkg)
5050
run: choco pack ./pkgs/chocolatey/scala.nuspec --out ./pkgs/chocolatey
5151
- name: Upload the Chocolatey package to GitHub
52-
uses: actions/upload-artifact@v4
52+
uses: actions/upload-artifact@v5
5353
with:
5454
name: scala.nupkg
5555
path: ./pkgs/chocolatey/scala.${{ inputs.version }}.nupkg

.github/workflows/build-msi.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ 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@v6
25+
- uses: actions/setup-java@v5
2626
with:
2727
distribution: 'adopt'
28-
java-version: '8'
28+
java-version: 17
2929
cache: 'sbt'
3030
- name: Build MSI package
3131
run: sbt 'dist-win-x86_64/Windows/packageBin'
3232
env:
3333
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3434
- name: Upload MSI Artifact
35-
uses: actions/upload-artifact@v4
35+
uses: actions/upload-artifact@v5
3636
with:
3737
name: scala.msi
3838
path: ./dist/win-x86_64/target/windows/scala.msi

.github/workflows/build-sdk.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,13 @@ 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@v6
59+
- uses: actions/setup-java@v5
6060
with:
6161
distribution: temurin
6262
java-version: ${{ inputs.java-version }}
6363
cache : sbt
64+
- uses: sbt/setup-sbt@v1
6465
- name: Build and pack the SDK (universal)
6566
run : ./project/scripts/sbt dist/Universal/stage
6667
- name: Build and pack the SDK (linux x86-64)
@@ -74,37 +75,37 @@ jobs:
7475
- name: Build and pack the SDK (win x86-64)
7576
run : ./project/scripts/sbt dist-win-x86_64/Universal/stage
7677
- name: Upload zip archive to GitHub Artifact (universal)
77-
uses: actions/upload-artifact@v4
78+
uses: actions/upload-artifact@v5
7879
id : universal
7980
with:
8081
path: ./dist/target/universal/stage
8182
name: scala3-universal
8283
- name: Upload zip archive to GitHub Artifact (linux x86-64)
83-
uses: actions/upload-artifact@v4
84+
uses: actions/upload-artifact@v5
8485
id : linux-x86_64
8586
with:
8687
path: ./dist/linux-x86_64/target/universal/stage
8788
name: scala3-x86_64-pc-linux
8889
- name: Upload zip archive to GitHub Artifact (linux aarch64)
89-
uses: actions/upload-artifact@v4
90+
uses: actions/upload-artifact@v5
9091
id : linux-aarch64
9192
with:
9293
path: ./dist/linux-aarch64/target/universal/stage
9394
name: scala3-aarch64-pc-linux
9495
- name: Upload zip archive to GitHub Artifact (mac x86-64)
95-
uses: actions/upload-artifact@v4
96+
uses: actions/upload-artifact@v5
9697
id : mac-x86_64
9798
with:
9899
path: ./dist/mac-x86_64/target/universal/stage
99100
name: scala3-x86_64-apple-darwin
100101
- name: Upload zip archive to GitHub Artifact (mac aarch64)
101-
uses: actions/upload-artifact@v4
102+
uses: actions/upload-artifact@v5
102103
id : mac-aarch64
103104
with:
104105
path: ./dist/mac-aarch64/target/universal/stage
105106
name: scala3-aarch64-apple-darwin
106107
- name: Upload zip archive to GitHub Artifact (win x86-64)
107-
uses: actions/upload-artifact@v4
108+
uses: actions/upload-artifact@v5
108109
id : win-x86_64
109110
with:
110111
path: ./dist/win-x86_64/target/universal/stage

0 commit comments

Comments
 (0)