Skip to content

Commit 87d9cab

Browse files
committed
Fix incorrect code in community build project definition
1 parent 1fff065 commit 87d9cab

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

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

+8-9
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ object projects:
362362
project = "shapeless-3",
363363
sbtTestCommand = "testJVM; testJS",
364364
sbtDocCommand = forceDoc("typeable", "deriving"),
365-
scalacOptions = "-source" :: "3.3" :: SbtCommunityProject.scalacOptions.filter(!List("-Ysafe-init", "-Wsafe-init").contains), // due to -Xfatal-warnings
365+
scalacOptions = "-source" :: "3.3" :: SbtCommunityProject.scalacOptions.filter(flag => flag != "-Ysafe-init" && flag != "-Wsafe-init"), // due to -Xfatal-warnings
366366
)
367367

368368
lazy val xmlInterpolator = SbtCommunityProject(
@@ -429,7 +429,7 @@ object projects:
429429
sbtTestCommand = "unitTests/test",
430430
// Adds <empty> package
431431
sbtDocCommand = "coreJVM/doc",
432-
scalacOptions = SbtCommunityProject.scalacOptions.filter(!List("-Ysafe-init", "-Wsafe-init").contains),
432+
scalacOptions = SbtCommunityProject.scalacOptions.filter(flag => flag != "-Ysafe-init" && flag != "-Wsafe-init"),
433433
dependencies = List(munit, scodecBits),
434434
)
435435

@@ -510,7 +510,7 @@ object projects:
510510
project = "discipline",
511511
sbtTestCommand = "coreJVM/test;coreJS/test",
512512
sbtPublishCommand = "set every credentials := Nil;coreJVM/publishLocal;coreJS/publishLocal",
513-
scalacOptions = SbtCommunityProject.scalacOptions.filter(!List("-Ysafe-init", "-Wsafe-init").contains),
513+
scalacOptions = SbtCommunityProject.scalacOptions.filter(flag => flag != "-Ysafe-init" && flag != "-Wsafe-init"),
514514
dependencies = List(scalacheck)
515515
)
516516

@@ -526,7 +526,7 @@ object projects:
526526
sbtTestCommand = "test",
527527
sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal",
528528
dependencies = List(discipline),
529-
scalacOptions = SbtCommunityProject.scalacOptions.filter(!List("-Ysafe-init", "-Wsafe-init").contains)
529+
scalacOptions = SbtCommunityProject.scalacOptions.filter(flag => flag != "-Ysafe-init" && flag != "-Wsafe-init")
530530
)
531531

532532
lazy val simulacrumScalafixAnnotations = SbtCommunityProject(
@@ -540,8 +540,7 @@ object projects:
540540
sbtTestCommand = "set Global/scalaJSStage := FastOptStage;rootJVM/test;rootJS/test",
541541
sbtPublishCommand = "rootJVM/publishLocal;rootJS/publishLocal",
542542
dependencies = List(discipline, disciplineMunit, scalacheck, simulacrumScalafixAnnotations),
543-
scalacOptions = SbtCommunityProject.scalacOptions.filter(!List("-Ysafe-init", "-Wsafe-init").contains) // disable -Ysafe-init or -Wsafe-init, due to -Xfatal-warning
544-
543+
scalacOptions = SbtCommunityProject.scalacOptions.filter(flag => flag != "-Ysafe-init" && flag != "-Wsafe-init") // disable -Ysafe-init or -Wsafe-init, due to -Xfatal-warning
545544
)
546545

547546
lazy val catsMtl = SbtCommunityProject(
@@ -656,7 +655,7 @@ object projects:
656655
"""set actorTests/Compile/scalacOptions -= "-Xfatal-warnings"""",
657656
"akka-actor-tests/Test/compile",
658657
).mkString("; "),
659-
scalacOptions = SbtCommunityProject.scalacOptions.filter(!List("-Ysafe-init", "-Wsafe-init").contains),
658+
scalacOptions = SbtCommunityProject.scalacOptions.filter(flag => flag != "-Ysafe-init" && flag != "-Wsafe-init"),
660659
dependencies = List(scalatest, scalatestplusJunit, scalatestplusScalacheck)
661660
)
662661

@@ -707,7 +706,7 @@ object projects:
707706
project = "fs2",
708707
sbtTestCommand = "coreJVM/test; coreJS/test", // io/test requires JDK9+
709708
sbtPublishCommand = "coreJVM/publishLocal; coreJS/publishLocal",
710-
scalacOptions = SbtCommunityProject.scalacOptions.filter(!List("-Ysafe-init", "-Wsafe-init").contains),
709+
scalacOptions = SbtCommunityProject.scalacOptions.filter(flag => flag != "-Ysafe-init" && flag != "-Wsafe-init"),
711710
dependencies = List(cats, catsEffect3, munitCatsEffect, scalacheckEffect, scodecBits)
712711
)
713712

@@ -744,7 +743,7 @@ object projects:
744743
project = "http4s",
745744
sbtTestCommand = """set ThisBuild / tlFatalWarnings := false; rootJVM/test""",
746745
sbtPublishCommand = "publishLocal",
747-
scalacOptions = SbtCommunityProject.scalacOptions.filter(!List("-Ysafe-init", "-Wsafe-init").contains),
746+
scalacOptions = SbtCommunityProject.scalacOptions.filter(flag => flag != "-Ysafe-init" && flag != "-Wsafe-init"),
748747
dependencies = List(cats, catsEffect3, fs2, disciplineMunit, scalacheckEffect)
749748
)
750749

0 commit comments

Comments
 (0)