Skip to content

Commit

Permalink
Replace shapeless by shapeless-3 in the community build.
Browse files Browse the repository at this point in the history
The Scala 3 support of shapeless has entirely moved to the
`typelevel/shapeless-3` repository. The old `shapeless` repository
removed Scala 3 support and is now Scala 2 only.

[Cherry-picked a7409cc]
  • Loading branch information
sjrd authored and Kordyjan committed Dec 7, 2023
1 parent a515420 commit 4df668c
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 13 deletions.
7 changes: 3 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
[submodule "community-build/community-projects/scala-xml"]
path = community-build/community-projects/scala-xml
url = https://github.com/dotty-staging/scala-xml
[submodule "community-build/community-projects/shapeless"]
path = community-build/community-projects/shapeless
url = https://github.com/dotty-staging/shapeless
branch = shapeless-3-staging
[submodule "community-build/community-projects/xml-interpolator"]
path = community-build/community-projects/xml-interpolator
url = https://github.com/dotty-staging/xml-interpolator.git
Expand Down Expand Up @@ -222,3 +218,6 @@
[submodule "community-build/community-projects/parboiled2"]
path = community-build/community-projects/parboiled2
url = https://github.com/dotty-staging/parboiled2.git
[submodule "community-build/community-projects/shapeless-3"]
path = community-build/community-projects/shapeless-3
url = https://github.com/dotty-staging/shapeless-3.git
1 change: 0 additions & 1 deletion community-build/community-projects/shapeless
Submodule shapeless deleted from 04e8ce
1 change: 1 addition & 0 deletions community-build/community-projects/shapeless-3
Submodule shapeless-3 added at d27c5b
12 changes: 5 additions & 7 deletions community-build/src/scala/dotty/communitybuild/projects.scala
Original file line number Diff line number Diff line change
Expand Up @@ -366,12 +366,10 @@ object projects:
// sbtDocCommand = "library/doc" // Does no compile? No idea :/
)


lazy val shapeless = SbtCommunityProject(
project = "shapeless",
sbtTestCommand = """set deriving/scalacOptions -= "-Xfatal-warnings"; set typeable/scalacOptions -= "-Xfatal-warnings"; test""",
// selectively disable -Xfatal-warnings due to deprecations
sbtDocCommand = forceDoc("typeable", "deriving", "data"),
lazy val shapeless3 = SbtCommunityProject(
project = "shapeless-3",
sbtTestCommand = "testJVM; testJS",
sbtDocCommand = forceDoc("typeable", "deriving"),
scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"), // due to -Xfatal-warnings
)

Expand Down Expand Up @@ -796,7 +794,7 @@ def allProjects = List(
projects.minitest,
projects.fastparse,
projects.stdLib213,
projects.shapeless,
projects.shapeless3,
projects.xmlInterpolator,
projects.effpi,
projects.sconfig,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class CommunityBuildTestC:
@Test def scalaz = projects.scalaz.run()
@Test def scas = projects.scas.run()
@Test def sconfig = projects.sconfig.run()
@Test def shapeless = projects.shapeless.run()
@Test def shapeless3 = projects.shapeless3.run()
@Test def sourcecode = projects.sourcecode.run()
@Test def specs2 = projects.specs2.run()

Expand Down

0 comments on commit 4df668c

Please sign in to comment.