Skip to content

Commit b32261f

Browse files
committed
Merge remote-tracking branch 'upstream/main' into stricter-pattern-bindings-3.2
2 parents 9b074e2 + 3d06d94 commit b32261f

File tree

193 files changed

+1797
-875
lines changed

Some content is hidden

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

193 files changed

+1797
-875
lines changed

.github/workflows/ci.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,10 @@ jobs:
232232
git submodule update --init --recursive --jobs 7
233233
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"
234234
235+
- name: Show dependency tracking file
236+
if: ${{ always() }}
237+
run: cat community-build/dotty-community-build-deps || true
238+
235239
community_build_b:
236240
runs-on: [self-hosted, Linux]
237241
container:
@@ -275,6 +279,10 @@ jobs:
275279
git submodule update --init --recursive --jobs 7
276280
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"
277281
282+
- name: Show dependency tracking file
283+
if: ${{ always() }}
284+
run: cat community-build/dotty-community-build-deps || true
285+
278286
community_build_c:
279287
runs-on: [self-hosted, Linux]
280288
container:
@@ -318,6 +326,10 @@ jobs:
318326
git submodule update --init --recursive --jobs 7
319327
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"
320328
329+
- name: Show dependency tracking file
330+
if: ${{ always() }}
331+
run: cat community-build/dotty-community-build-deps || true
332+
321333
community_build_forward_compat:
322334
runs-on: [self-hosted, Linux]
323335
container:

.github/workflows/scaladoc.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ jobs:
5252
- name: Generate testcases documentation
5353
run: ./project/scripts/sbt scaladoc/generateTestcasesDocumentation
5454

55+
- name: Generate reference documentation
56+
run: ./project/scripts/sbt scaladoc/generateReferenceDocumentation
57+
5558
- name: Generate Scala 3 documentation
5659
run: ./project/scripts/sbt scaladoc/generateScalaDocumentation
5760

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ compiler/after-pickling.txt
6565
bench/compile.txt
6666

6767
community-build/scala3-bootstrapped.version
68+
community-build/sbt-injected-plugins
6869
community-build/sbt-dotty-sbt
6970
community-build/sbt-scalajs-sbt
7071
community-build/dotty-community-build-deps

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "community-build/community-projects/algebra"]
2-
path = community-build/community-projects/algebra
3-
url = https://github.com/dotty-staging/algebra
41
[submodule "community-build/community-projects/betterfiles"]
52
path = community-build/community-projects/betterfiles
63
url = https://github.com/dotty-staging/better-files
@@ -250,3 +247,6 @@
250247
[submodule "community-build/community-projects/scalacheck-forward-compat"]
251248
path = community-build/community-projects/scalacheck-forward-compat
252249
url = https://github.com/dotty-staging/scalacheck
250+
[submodule "community-build/community-projects/http4s"]
251+
path = community-build/community-projects/http4s
252+
url = https://github.com/dotty-staging/http4s.git

bench/profiles/projects.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ charts:
2626

2727
scripts:
2828
dotty:
29-
- measure -with-compiler $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java)
29+
- measure -feature -deprecation -unchecked -Xfatal-warnings -encoding UTF8 -language:implicitConversions -Yexplicit-nulls -with-compiler $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java)
3030

3131
re2s:
3232
- measure $(find $PROG_HOME/tests/re2s/src -name *.scala)
Submodule AsyncFile updated 28 files
Submodule Lucre updated 326 files
Submodule Monocle updated 110 files
Submodule ScalaPB updated 652 files
Submodule akka updated 1306 files
Lines changed: 0 additions & 1 deletion
This file was deleted.
Submodule cats updated 298 files
Submodule fs2 updated 307 files
Submodule http4s added at fc0a18d
Submodule play-json updated 78 files
Submodule scala-xml updated 115 files
Submodule scalatest updated 244 files
Submodule scalaz updated 119 files
Submodule scodec updated 85 files
Submodule scodec-bits updated 31 files
Submodule sconfig updated 230 files
Submodule spire updated 128 files
Submodule zio updated 716 files

community-build/src/scala/dotty/communitybuild/CommunityBuildRunner.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ trait CommunityBuildRunner:
3434
/** Build the given project with the published local compiler and sbt plugin.
3535
*
3636
* This test reads the compiler version from community-build/dotty-bootstrapped.version
37-
* and expects community-build/sbt-dotty-sbt to set the compiler plugin.
37+
* and expects community-build/sbt-injected-plugins to set any necessary plugins.
3838
*
3939
* @param project The project name, should be a git submodule in community-build/
4040
* @param command The binary file of the program used to test the project – usually

0 commit comments

Comments
 (0)