Skip to content

Resurrect parboiled2 in community build #26797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SolalPirelli merged 1 commit into from
Aug 13, 2026
+11 −7
Merged

Resurrect parboiled2 in community build #26797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions community-build/src/scala/dotty/communitybuild/projects.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ sealed case class MillCommunityProject(
override val runCommandsArgs = List("-i", "-D", s"dottyVersion=$compilerVersion")
override val environment = Map.empty

val sbt1Version = "1.12.1"
val sbt2Version = "2.0.3"

final case class SbtCommunityProject(
project: String,
sbtTestCommand: String,
Expand All @@ -89,6 +92,7 @@ final case class SbtCommunityProject(
sbtDocCommand: String = null,
scalacOptions: List[String] = SbtCommunityProject.scalacOptions,
override val environment: Map[String, String] = Map.empty,
sbtVersion: String = sbt1Version
) extends CommunityProject:
override val binaryName: String = "sbt"

Expand Down Expand Up @@ -117,7 +121,7 @@ final case class SbtCommunityProject(
val sbtProps = Option(System.getProperty("sbt.ivy.home")) match
case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome")
case _ => Nil
extraSbtArgs ++ sbtProps ++ List("-sbt-version", "1.12.1", "-Dsbt.supershell=false", s"--addPluginSbtFile=$sbtPluginFilePath")
extraSbtArgs ++ sbtProps ++ List(s"-Dsbt.version=$sbtVersion", "-Dsbt.supershell=false", s"--addPluginSbtFile=$sbtPluginFilePath")

object SbtCommunityProject:
def scalacOptions = List(
Expand Down Expand Up @@ -687,13 +691,13 @@ object projects:
scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Wsafe-init"),
)

// Disabled because it requires SBT 2
/*lazy val parboiled2 = SbtCommunityProject(
lazy val parboiled2 = SbtCommunityProject(
project = "parboiled2",
sbtTestCommand = "parboiledCoreJVM3/test; parboiledJVM3/test",
sbtTestCommand = "parboiledCoreJVM3/testFull; parboiledJVM3/testFull",
sbtPublishCommand = "publishLocal",
scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Xcheck-macros"),
)*/
sbtVersion = sbt2Version,
)

end projects

Expand Down Expand Up @@ -774,7 +778,7 @@ def allProjects = List(
projects.specs2,
projects.spire,
projects.http4s,
//projects.parboiled2,
projects.parboiled2,
)

lazy val projectMap = allProjects.groupBy(_.project)
2 changes: 1 addition & 1 deletion community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,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 parboiled2 = projects.parboiled2.run()
// Disabled because `javax.xml.bind` is not available since java 11
// @Test def playJson = projects.playJson.run()
@Test def pprint = projects.pprint.run()
Expand Down
Loading