Skip to content

Commit 9370bdf

Browse files
authored
Merge pull request #15038 from dotty-staging/language-reference-fix
Update language reference documentation. Change shown version to 3.1.2
2 parents 83e76c1 + 70e8f4d commit 9370bdf

File tree

304 files changed

+9755
-1437
lines changed

Some content is hidden

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

304 files changed

+9755
-1437
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -371,49 +371,6 @@ jobs:
371371
if: ${{ always() }}
372372
run: cat community-build/dotty-community-build-deps || true
373373

374-
community_build_forward_compat:
375-
runs-on: [self-hosted, Linux]
376-
container:
377-
image: lampepfl/dotty:2021-03-22
378-
options: --cpu-shares 4096
379-
volumes:
380-
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
381-
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
382-
- ${{ github.workspace }}/../../cache/general:/root/.cache
383-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
384-
|| (
385-
github.event_name == 'pull_request'
386-
&& !contains(github.event.pull_request.body, '[skip ci]')
387-
&& !contains(github.event.pull_request.body, '[skip community_build]')
388-
&& contains(github.event.pull_request.body, '[test_forward_compat]')
389-
)
390-
|| (
391-
github.event_name == 'workflow_dispatch'
392-
&& github.repository == 'lampepfl/dotty'
393-
)"
394-
395-
steps:
396-
- name: Reset existing repo
397-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
398-
399-
- name: Checkout cleanup script
400-
uses: actions/checkout@v2
401-
402-
- name: Cleanup
403-
run: .github/workflows/cleanup.sh
404-
405-
- name: Git Checkout
406-
uses: actions/checkout@v2
407-
408-
- name: Add SBT proxy repositories
409-
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
410-
411-
- name: Test
412-
run: |
413-
git submodule sync
414-
git submodule update --init --recursive --jobs 7
415-
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestForwardCompat"
416-
417374
test_sbt:
418375
runs-on: [self-hosted, Linux]
419376
container:
@@ -513,7 +470,7 @@ jobs:
513470
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
514471
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
515472
- ${{ github.workspace }}/../../cache/general:/root/.cache
516-
needs: [test_non_bootstrapped, test, mima, community_build_a, community_build_b, community_build_c, community_build_forward_compat, test_sbt, test_java8]
473+
needs: [test_non_bootstrapped, test, mima, community_build_a, community_build_b, community_build_c, test_sbt, test_java8]
517474
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
518475
env:
519476
NIGHTLYBUILD: yes

.gitmodules

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -216,37 +216,6 @@
216216
[submodule "community-build/community-projects/spire"]
217217
path = community-build/community-projects/spire
218218
url = https://github.com/dotty-staging/spire.git
219-
[submodule "community-build/community-projects/munit-forward-compat"]
220-
path = community-build/community-projects/munit-forward-compat
221-
url = https://github.com/dotty-staging/munit.git
222-
[submodule "community-build/community-projects/discipline-forward-compat"]
223-
path = community-build/community-projects/discipline-forward-compat
224-
url = https://github.com/dotty-staging/discipline.git
225-
[submodule "community-build/community-projects/discipline-munit-forward-compat"]
226-
path = community-build/community-projects/discipline-munit-forward-compat
227-
url = https://github.com/dotty-staging/discipline-munit.git
228-
[submodule "community-build/community-projects/discipline-specs2-forward-compat"]
229-
path = community-build/community-projects/discipline-specs2-forward-compat
230-
url = https://github.com/dotty-staging/discipline-specs2.git
231-
[submodule "community-build/community-projects/simulacrum-scalafix-forward-compat"]
232-
path = community-build/community-projects/simulacrum-scalafix-forward-compat
233-
url = https://github.com/dotty-staging/simulacrum-scalafix.git
234-
[submodule "community-build/community-projects/cats-forward-compat"]
235-
path = community-build/community-projects/cats-forward-compat
236-
url = https://github.com/dotty-staging/cats.git
237-
[submodule "community-build/community-projects/cats-mtl-forward-compat"]
238-
path = community-build/community-projects/cats-mtl-forward-compat
239-
url = https://github.com/dotty-staging/cats-mtl.git
240-
[submodule "community-build/community-projects/coop-forward-compat"]
241-
path = community-build/community-projects/coop-forward-compat
242-
url = https://github.com/dotty-staging/coop.git
243-
[submodule "community-build/community-projects/cats-effect-3-forward-compat"]
244-
path = community-build/community-projects/cats-effect-3-forward-compat
245-
url = https://github.com/dotty-staging/cats-effect.git
246-
branch = series/3.x
247-
[submodule "community-build/community-projects/scalacheck-forward-compat"]
248-
path = community-build/community-projects/scalacheck-forward-compat
249-
url = https://github.com/dotty-staging/scalacheck
250219
[submodule "community-build/community-projects/http4s"]
251220
path = community-build/community-projects/http4s
252221
url = https://github.com/dotty-staging/http4s.git

NOTICE.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ major authors were omitted by oversight.
8888
docs/js/. Please refer to the license header of the concerned files for
8989
details.
9090

91+
* dotty.tools.dotc.coverage: Coverage instrumentation utilities have been
92+
adapted from the scoverage plugin for scala 2 [5], which is under the
93+
Apache 2.0 license.
94+
9195
* The Dotty codebase contains parts which are derived from
9296
the ScalaPB protobuf library [4], which is under the Apache 2.0 license.
9397

@@ -96,3 +100,4 @@ major authors were omitted by oversight.
96100
[2] https://github.com/adriaanm/scala/tree/sbt-api-consolidate/src/compiler/scala/tools/sbt
97101
[3] https://github.com/sbt/sbt/tree/0.13/compile/interface/src/main/scala/xsbt
98102
[4] https://github.com/lampepfl/dotty/pull/5783/files
103+
[5] https://github.com/scoverage/scalac-scoverage-plugin
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ object CommunityBuildRunner:
1717
* for more infrastructural details.
1818
*/
1919
extension (self: CommunityProject) def run()(using suite: CommunityBuildRunner): Unit =
20-
if self.requiresExperimental && !self.compilerSupportExperimental then
20+
if self.requiresExperimental && !compilerSupportExperimental then
2121
log(s"Skipping ${self.project} - it needs experimental features unsupported in this build.")
2222
return
23-
self.dependencies().foreach(_.publish())
23+
self.dependencies.foreach(_.publish())
2424
self.testOnlyDependencies().foreach(_.publish())
2525
suite.runProject(self)
2626

@@ -45,7 +45,6 @@ trait CommunityBuildRunner:
4545
val project = projectDef.project
4646
val command = projectDef.binaryName
4747
val arguments = projectDef.buildCommands
48-
val compilerVersion = projectDef.compilerVersion
4948

5049
@annotation.tailrec
5150
def execTimes(task: () => Int, timesToRerun: Int): Boolean =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ object Main:
5757
val (toRun, ignored) =
5858
allProjects.partition( p =>
5959
p.docCommand != null
60-
&& (!p.requiresExperimental || p.compilerSupportExperimental)
60+
&& (!p.requiresExperimental || compilerSupportExperimental)
6161
)
6262

6363
val paths = toRun.map { project =>

0 commit comments

Comments
 (0)