Skip to content

Commit c9e65a7

Browse files
committed
Merge branch 'main' of https://github.com/rochala/dotty into signature-help-enclosing-apply-fix
2 parents fa403fe + f0dd0eb commit c9e65a7

File tree

94 files changed

+2156
-808
lines changed

Some content is hidden

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

94 files changed

+2156
-808
lines changed

.github/workflows/language-reference.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Generate reference documentation and test links
4646
run: |
4747
cd dotty
48-
./project/scripts/sbt scaladoc/generateReferenceDocumentation --no-regenerate-expected-links
48+
./project/scripts/sbt "scaladoc/generateReferenceDocumentation --no-regenerate-expected-links"
4949
./project/scripts/docsLinksStability ./scaladoc/output/reference ./project/scripts/expected-links/reference-expected-links.txt
5050
cd ..
5151

.github/workflows/scaladoc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
run: ./project/scripts/sbt scaladoc/generateTestcasesDocumentation
5858

5959
- name: Generate reference documentation
60-
run: ./project/scripts/sbt scaladoc/generateReferenceDocumentation --no-regenerate-expected-links
60+
run: ./project/scripts/sbt scaladoc/generateReferenceDocumentation
6161

6262
- name: Generate Scala 3 documentation
6363
run: ./project/scripts/sbt scaladoc/generateScalaDocumentation

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,3 +219,6 @@
219219
[submodule "community-build/community-projects/http4s"]
220220
path = community-build/community-projects/http4s
221221
url = https://github.com/dotty-staging/http4s.git
222+
[submodule "community-build/community-projects/parboiled2"]
223+
path = community-build/community-projects/parboiled2
224+
url = https://github.com/dotty-staging/parboiled2.git
Submodule parboiled2 added at 6281277

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,14 @@ object projects:
761761
dependencies = List(cats, catsEffect3, fs2, disciplineMunit, scalacheckEffect)
762762
)
763763

764+
lazy val parboiled2 = SbtCommunityProject(
765+
project = "parboiled2",
766+
sbtTestCommand = "parboiledCoreJVM/test; parboiledJVM/test",
767+
sbtPublishCommand = "publishLocal",
768+
scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Xcheck-macros"),
769+
dependencies = List(utest, scalacheck)
770+
)
771+
764772
end projects
765773

766774
def allProjects = List(
@@ -841,7 +849,8 @@ def allProjects = List(
841849
projects.specs2,
842850
projects.coop,
843851
projects.spire,
844-
projects.http4s
852+
projects.http4s,
853+
projects.parboiled2,
845854
)
846855

847856
lazy val projectMap = allProjects.groupBy(_.project)

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ class CommunityBuildTestC:
7474
@Test def onnxScala = projects.onnxScala.run()
7575
@Test def oslib = projects.oslib.run()
7676
// @Test def oslibWatch = projects.oslibWatch.run()
77+
@Test def parboiled2 = projects.parboiled2.run()
7778
@Test def playJson = projects.playJson.run()
7879
@Test def pprint = projects.pprint.run()
7980
@Test def protoquill = projects.protoquill.run()

0 commit comments

Comments
 (0)