Skip to content

Commit 83a668c

Browse files
authored
Backport "don't disable all scalacOptions, only Ysafe-init and Xcheck-macros" to LTS (#19129)
Backports #18268 to the LTS branch. PR submitted by the release tooling. [skip ci]
2 parents 32a6cfc + bcdf6bb commit 83a668c

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)