Skip to content

add scala-java8-compat and jackson-module-scala to community build #13168

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
merged 2 commits into from
Aug 5, 2021
Merged

add scala-java8-compat and jackson-module-scala to community build #13168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
309b54b
add jackson-module-scala to community build
pjfanning Jul 27, 2021
ad24812
community build: build scalaJava8Compat/fnGen with Scala 2.12
griggt Aug 2, 2021
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
6 changes: 6 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,3 +207,9 @@
[submodule "community-build/community-projects/libretto"]
path = community-build/community-projects/libretto
url = https://github.com/dotty-staging/libretto.git
[submodule "community-build/community-projects/jackson-module-scala"]
path = community-build/community-projects/jackson-module-scala
url = https://github.com/FasterXML/jackson-module-scala.git
[submodule "community-build/community-projects/scala-java8-compat"]
path = community-build/community-projects/scala-java8-compat
url = https://github.com/scala/scala-java8-compat.git
1 change: 1 addition & 0 deletions community-build/community-projects/jackson-module-scala
Open in desktop
Submodule jackson-module-scala added at 13e3a3
1 change: 1 addition & 0 deletions community-build/community-projects/scala-java8-compat
Open in desktop
Submodule scala-java8-compat added at 57e1f7
17 changes: 17 additions & 0 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 @@ -508,6 +508,14 @@ object projects:
sbtPublishCommand = "compat30/publishLocal",
)

lazy val scalaJava8Compat = SbtCommunityProject(
project = "scala-java8-compat",
// the fnGen subproject must be built with 2.12.x
sbtTestCommand = s"++2.12.14; ++$compilerVersion; set fnGen/dependencyOverrides := Nil; test",
sbtPublishCommand = s"++2.12.14; ++$compilerVersion; set fnGen/dependencyOverrides := Nil; publishLocal",
scalacOptions = Nil // avoid passing Scala 3 options to Scala 2.12 in fnGen subproject
)

lazy val verify = SbtCommunityProject(
project = "verify",
sbtTestCommand = "verifyJVM/test",
Expand Down Expand Up @@ -716,6 +724,13 @@ object projects:
dependencies = List(scalatest)
)

lazy val jacksonModuleScala = SbtCommunityProject(
project = "jackson-module-scala",
sbtTestCommand = "test",
sbtPublishCommand = "publishLocal",
dependencies = List(scalaJava8Compat, scalatest)
)

end projects

def allProjects = List(
Expand Down Expand Up @@ -762,6 +777,7 @@ def allProjects = List(
projects.catsEffect3,
projects.scalaParallelCollections,
projects.scalaCollectionCompat,
projects.scalaJava8Compat,
projects.verify,
projects.discipline,
projects.disciplineMunit,
Expand Down Expand Up @@ -792,6 +808,7 @@ def allProjects = List(
projects.scalacheckEffect,
projects.fs2,
projects.libretto,
projects.jacksonModuleScala,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why isn't the java8-compat included in this list?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

apologies - missed that, I've fixed up the PR to include that

)

lazy val projectMap = allProjects.groupBy(_.project)
2 changes: 2 additions & 0 deletions 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 @@ -145,6 +145,7 @@ class CommunityBuildTestC extends CommunityBuildTest:
@Test def fastparse = projects.fastparse.run()
@Test def geny = projects.geny.run()
@Test def intent = projects.intent.run()
@Test def jacksonModuleScala = projects.jacksonModuleScala.run()
@Test def libretto = projects.libretto.run()
@Test def minitest = projects.minitest.run()
@Test def onnxScala = projects.onnxScala.run()
Expand All @@ -156,6 +157,7 @@ class CommunityBuildTestC extends CommunityBuildTest:
@Test def requests = projects.requests.run()
@Test def scalacheck = projects.scalacheck.run()
@Test def scalaCollectionCompat = projects.scalaCollectionCompat.run()
@Test def scalaJava8Compat = projects.scalaJava8Compat.run()
@Test def scalap = projects.scalap.run()
@Test def scalaParallelCollections = projects.scalaParallelCollections.run()
@Test def scalaParserCombinators = projects.scalaParserCombinators.run()
Expand Down