Skip to content

Commit 7d702a3

Browse files
Merge pull request #13168 from pjfanning/jackson-module-scala
add scala-java8-compat and jackson-module-scala to community build
2 parents 8b2afe5 + ad24812 commit 7d702a3

File tree

5 files changed

+27
-0
lines changed

5 files changed

+27
-0
lines changed

.gitmodules

+6
Original file line numberDiff line numberDiff line change
@@ -207,3 +207,9 @@
207207
[submodule "community-build/community-projects/libretto"]
208208
path = community-build/community-projects/libretto
209209
url = https://github.com/dotty-staging/libretto.git
210+
[submodule "community-build/community-projects/jackson-module-scala"]
211+
path = community-build/community-projects/jackson-module-scala
212+
url = https://github.com/FasterXML/jackson-module-scala.git
213+
[submodule "community-build/community-projects/scala-java8-compat"]
214+
path = community-build/community-projects/scala-java8-compat
215+
url = https://github.com/scala/scala-java8-compat.git

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

+17
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,14 @@ object projects:
508508
sbtPublishCommand = "compat30/publishLocal",
509509
)
510510

511+
lazy val scalaJava8Compat = SbtCommunityProject(
512+
project = "scala-java8-compat",
513+
// the fnGen subproject must be built with 2.12.x
514+
sbtTestCommand = s"++2.12.14; ++$compilerVersion; set fnGen/dependencyOverrides := Nil; test",
515+
sbtPublishCommand = s"++2.12.14; ++$compilerVersion; set fnGen/dependencyOverrides := Nil; publishLocal",
516+
scalacOptions = Nil // avoid passing Scala 3 options to Scala 2.12 in fnGen subproject
517+
)
518+
511519
lazy val verify = SbtCommunityProject(
512520
project = "verify",
513521
sbtTestCommand = "verifyJVM/test",
@@ -716,6 +724,13 @@ object projects:
716724
dependencies = List(scalatest)
717725
)
718726

727+
lazy val jacksonModuleScala = SbtCommunityProject(
728+
project = "jackson-module-scala",
729+
sbtTestCommand = "test",
730+
sbtPublishCommand = "publishLocal",
731+
dependencies = List(scalaJava8Compat, scalatest)
732+
)
733+
719734
end projects
720735

721736
def allProjects = List(
@@ -762,6 +777,7 @@ def allProjects = List(
762777
projects.catsEffect3,
763778
projects.scalaParallelCollections,
764779
projects.scalaCollectionCompat,
780+
projects.scalaJava8Compat,
765781
projects.verify,
766782
projects.discipline,
767783
projects.disciplineMunit,
@@ -792,6 +808,7 @@ def allProjects = List(
792808
projects.scalacheckEffect,
793809
projects.fs2,
794810
projects.libretto,
811+
projects.jacksonModuleScala,
795812
)
796813

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

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

+2
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ class CommunityBuildTestC extends CommunityBuildTest:
145145
@Test def fastparse = projects.fastparse.run()
146146
@Test def geny = projects.geny.run()
147147
@Test def intent = projects.intent.run()
148+
@Test def jacksonModuleScala = projects.jacksonModuleScala.run()
148149
@Test def libretto = projects.libretto.run()
149150
@Test def minitest = projects.minitest.run()
150151
@Test def onnxScala = projects.onnxScala.run()
@@ -156,6 +157,7 @@ class CommunityBuildTestC extends CommunityBuildTest:
156157
@Test def requests = projects.requests.run()
157158
@Test def scalacheck = projects.scalacheck.run()
158159
@Test def scalaCollectionCompat = projects.scalaCollectionCompat.run()
160+
@Test def scalaJava8Compat = projects.scalaJava8Compat.run()
159161
@Test def scalap = projects.scalap.run()
160162
@Test def scalaParallelCollections = projects.scalaParallelCollections.run()
161163
@Test def scalaParserCombinators = projects.scalaParserCombinators.run()

0 commit comments

Comments
 (0)