From 37d97bcd1783d820b62258dfd06ea3af918062e0 Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Tue, 12 Apr 2022 14:06:25 +0200 Subject: [PATCH 1/4] Add parboiled2 to community build --- .gitmodules | 3 +++ community-build/community-projects/parboiled2 | 1 + .../src/scala/dotty/communitybuild/projects.scala | 11 ++++++++++- .../dotty/communitybuild/CommunityBuildTest.scala | 1 + 4 files changed, 15 insertions(+), 1 deletion(-) create mode 160000 community-build/community-projects/parboiled2 diff --git a/.gitmodules b/.gitmodules index aadf222714ad..105033ed14eb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -219,3 +219,6 @@ [submodule "community-build/community-projects/http4s"] path = community-build/community-projects/http4s url = https://github.com/dotty-staging/http4s.git +[submodule "community-build/community-projects/parboiled2"] + path = community-build/community-projects/parboiled2 + url = https://github.com/sirthias/parboiled2.git diff --git a/community-build/community-projects/parboiled2 b/community-build/community-projects/parboiled2 new file mode 160000 index 000000000000..628127744bde --- /dev/null +++ b/community-build/community-projects/parboiled2 @@ -0,0 +1 @@ +Subproject commit 628127744bde8dc2e01432badd68886a5f722f71 diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 3a0ec6c280b7..7bff1b0c90a0 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -761,6 +761,14 @@ object projects: dependencies = List(cats, catsEffect3, fs2, disciplineMunit, scalacheckEffect) ) + lazy val parboiled2 = SbtCommunityProject( + project = "parboiled2", + sbtTestCommand = "parboiledCoreJVM/test; parboiledJVM/test", + sbtPublishCommand = "publishLocal", + scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Xcheck-macros"), + dependencies = () => List(utest, scalatest) + ) + end projects def allProjects = List( @@ -841,7 +849,8 @@ def allProjects = List( projects.specs2, projects.coop, projects.spire, - projects.http4s + projects.http4s, + projects.parboiled2, ) lazy val projectMap = allProjects.groupBy(_.project) diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index 657d49db3172..146ad6f4f951 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -74,6 +74,7 @@ class CommunityBuildTestC: @Test def onnxScala = projects.onnxScala.run() @Test def oslib = projects.oslib.run() // @Test def oslibWatch = projects.oslibWatch.run() + @Test def parboiled2 = projects.parboiled2.run() @Test def playJson = projects.playJson.run() @Test def pprint = projects.pprint.run() @Test def protoquill = projects.protoquill.run() From e95c28729f9004684c33769463b110c0ff47993f Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Mon, 25 Apr 2022 11:02:34 +0200 Subject: [PATCH 2/4] fix dependency declaration --- community-build/src/scala/dotty/communitybuild/projects.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 7bff1b0c90a0..7552f70105ce 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -766,7 +766,7 @@ object projects: sbtTestCommand = "parboiledCoreJVM/test; parboiledJVM/test", sbtPublishCommand = "publishLocal", scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Xcheck-macros"), - dependencies = () => List(utest, scalatest) + dependencies = List(utest, scalatest) ) end projects From 952218d3883135586f1fc7f9ac28a2756d637256 Mon Sep 17 00:00:00 2001 From: Tom Grigg Date: Wed, 4 May 2022 09:35:32 -0700 Subject: [PATCH 3/4] Use dotty-staging fork of parboiled2 --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 105033ed14eb..4d87dd214e9c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -221,4 +221,4 @@ url = https://github.com/dotty-staging/http4s.git [submodule "community-build/community-projects/parboiled2"] path = community-build/community-projects/parboiled2 - url = https://github.com/sirthias/parboiled2.git + url = https://github.com/dotty-staging/parboiled2.git From d057e6364fd67da1d21f621b62ed2d59d0c1b388 Mon Sep 17 00:00:00 2001 From: Tom Grigg Date: Wed, 4 May 2022 12:10:13 -0700 Subject: [PATCH 4/4] parboiled2 appears to use scalacheck but not scalatest --- community-build/src/scala/dotty/communitybuild/projects.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 7552f70105ce..dc8047a95935 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -766,7 +766,7 @@ object projects: sbtTestCommand = "parboiledCoreJVM/test; parboiledJVM/test", sbtPublishCommand = "publishLocal", scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Xcheck-macros"), - dependencies = List(utest, scalatest) + dependencies = List(utest, scalacheck) ) end projects