Skip to content

Commit 451838f

Browse files
sjrdKordyjan
authored andcommitted
Replace shapeless by shapeless-3 in the community build.
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]
1 parent 4623a10 commit 451838f

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

.gitmodules

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
[submodule "community-build/community-projects/scala-xml"]
2929
path = community-build/community-projects/scala-xml
3030
url = https://github.com/dotty-staging/scala-xml
31-
[submodule "community-build/community-projects/shapeless"]
32-
path = community-build/community-projects/shapeless
33-
url = https://github.com/dotty-staging/shapeless
34-
branch = shapeless-3-staging
3531
[submodule "community-build/community-projects/xml-interpolator"]
3632
path = community-build/community-projects/xml-interpolator
3733
url = https://github.com/dotty-staging/xml-interpolator.git
@@ -222,3 +218,6 @@
222218
[submodule "community-build/community-projects/parboiled2"]
223219
path = community-build/community-projects/parboiled2
224220
url = https://github.com/dotty-staging/parboiled2.git
221+
[submodule "community-build/community-projects/shapeless-3"]
222+
path = community-build/community-projects/shapeless-3
223+
url = https://github.com/dotty-staging/shapeless-3.git
Lines changed: 0 additions & 1 deletion
This file was deleted.
Submodule shapeless-3 added at d27c5ba

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -366,12 +366,10 @@ object projects:
366366
// sbtDocCommand = "library/doc" // Does no compile? No idea :/
367367
)
368368

369-
370-
lazy val shapeless = SbtCommunityProject(
371-
project = "shapeless",
372-
sbtTestCommand = """set deriving/scalacOptions -= "-Xfatal-warnings"; set typeable/scalacOptions -= "-Xfatal-warnings"; test""",
373-
// selectively disable -Xfatal-warnings due to deprecations
374-
sbtDocCommand = forceDoc("typeable", "deriving", "data"),
369+
lazy val shapeless3 = SbtCommunityProject(
370+
project = "shapeless-3",
371+
sbtTestCommand = "testJVM; testJS",
372+
sbtDocCommand = forceDoc("typeable", "deriving"),
375373
scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"), // due to -Xfatal-warnings
376374
)
377375

@@ -796,7 +794,7 @@ def allProjects = List(
796794
projects.minitest,
797795
projects.fastparse,
798796
projects.stdLib213,
799-
projects.shapeless,
797+
projects.shapeless3,
800798
projects.xmlInterpolator,
801799
projects.effpi,
802800
projects.sconfig,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class CommunityBuildTestC:
9191
@Test def scalaz = projects.scalaz.run()
9292
@Test def scas = projects.scas.run()
9393
@Test def sconfig = projects.sconfig.run()
94-
@Test def shapeless = projects.shapeless.run()
94+
@Test def shapeless3 = projects.shapeless3.run()
9595
@Test def sourcecode = projects.sourcecode.run()
9696
@Test def specs2 = projects.specs2.run()
9797

0 commit comments

Comments
 (0)