Skip to content

bugfix: Don't apply Next flags on 3.3 LTS #629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WojciechMazur merged 1 commit into from
Apr 9, 2026
Merged

bugfix: Don't apply Next flags on 3.3 LTS #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions coordinator/configs/projects-config.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ gchudnov_swearwolf.sbt.commands = ["disableFatalWarnings"]
geirolz_fly4s{
tests = compile-only // flaky
sbt.commands = [
"mapScalacOptions -Xkind-projector,-deprecation -Ykind-projector"
"mapScalacOptions -Xkind-projector,-deprecation -Ykind-projector 3.3"
]
}
geirolz_advxml{
Expand All @@ -726,7 +726,7 @@ geirolz_advxml{
}
geirolz_secret {
sbt.commands = [
"mapScalacOptions -Xkind-projector"
"mapScalacOptions -Xkind-projector 3.3"
]
}
geirolz_toolkit {
Expand Down
8 changes: 6 additions & 2 deletions project-builder/sbt/CommunityBuildPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ object CommunityBuildPlugin extends AutoPlugin {
(args, extracted) => (scope: Scope, currentScalacOptions: Seq[String]) =>
val scalaVersion = extracted.get(scope / Keys.scalaVersion)
val safeArgs = args.map(Scala3CommunityBuild.Utils.splitScalacOptionArgs)
val ignoredVersions = safeArgs.lift(2).getOrElse(Nil)
val shouldIgnore = ignoredVersions.exists(scalaVersion.startsWith)
val append = safeArgs.lift(0).getOrElse(Nil)
lazy val (appendScala3Exclusive, appendScala3Inclusive) =
append.partition { opt =>
Expand All @@ -213,7 +215,8 @@ object CommunityBuildPlugin extends AutoPlugin {
// Make sure to not modify Scala 2 project scalacOptions
// these can compiled as transitive dependency of custom startup task
val filteredAppend =
if (scalaVersion.startsWith("3.")) append
if (shouldIgnore) Nil
else if (scalaVersion.startsWith("3.")) append
else {
appendScala3Exclusive.foreach { setting =>
logOnce(
Expand All @@ -225,7 +228,8 @@ object CommunityBuildPlugin extends AutoPlugin {

val remove = safeArgs.lift(1).getOrElse(Nil)
val filteredRemove =
if (scalaVersion.startsWith("3.")) remove
if (shouldIgnore) Nil
else if (scalaVersion.startsWith("3.")) remove
else remove ++ appendScala3Exclusive

Scala3CommunityBuild.Utils.mapScalacOptions(
Expand Down
Loading