Skip to content

Commit b94f7ec

Browse files
olhotakckipp01
authored andcommitted
don't disable all scalacOptions, only selectively Ysafe-init and Xcheck-macros
In the community build runner, comments for the shapeless and protoquill projects say to disable the Ysafe-init and Xcheck-macros options, but the implementation disables all scalacOptions. This change makes the implementation match the comments. Also, the comment for protoquill incorrectly stated that Ysafe-init needs to be disabled due to a buggy macro. The project works fine with Ysafe-init, but the buggy macro requires Xcheck-macros disabled.
1 parent 5afe621 commit b94f7ec

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ object projects:
372372
sbtTestCommand = """set deriving/scalacOptions -= "-Xfatal-warnings"; set typeable/scalacOptions -= "-Xfatal-warnings"; test""",
373373
// selectively disable -Xfatal-warnings due to deprecations
374374
sbtDocCommand = forceDoc("typeable", "deriving", "data"),
375-
scalacOptions = Nil // disable -Ysafe-init, due to -Xfatal-warnings
375+
scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Ysafe-init"), // due to -Xfatal-warnings
376376
)
377377

378378
lazy val xmlInterpolator = SbtCommunityProject(
@@ -682,7 +682,7 @@ object projects:
682682
sbtTestCommand = "runCommunityBuild",
683683
sbtPublishCommand = "publishLocal",
684684
dependencies = List(scalatest),
685-
scalacOptions = List("-language:implicitConversions"), // disabled -Ysafe-init, due to bug in macro
685+
scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Xcheck-macros") :+ "-language:implicitConversions", // disabled -Xcheck-macros, due to bug in macro
686686
)
687687

688688
lazy val onnxScala = SbtCommunityProject(

0 commit comments

Comments
 (0)