From 8ab0d1961935a76feffa8784d2ee631fe10b38be Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Fri, 3 Jan 2025 15:08:33 +0100 Subject: [PATCH] fix `-Wconf` to match new semantics Override order reversed, see also https://github.com/scala/scala/releases --- project/PekkoDisciplinePlugin.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/project/PekkoDisciplinePlugin.scala b/project/PekkoDisciplinePlugin.scala index 1e1f4a94e43..0ffbb5bf125 100644 --- a/project/PekkoDisciplinePlugin.scala +++ b/project/PekkoDisciplinePlugin.scala @@ -74,9 +74,10 @@ object PekkoDisciplinePlugin extends AutoPlugin { "pekko-stream-tests-tck", "pekko-testkit") - lazy val defaultScalaOptions = Def.setting(CrossVersion.partialVersion(scalaVersion.value) match { - case Some((2, 12)) => "-Wconf:cat=unused-nowarn:s,any:e" - case _ => "-Wconf:cat=unused-nowarn:s,cat=other-shadowing:s,any:e" + lazy val defaultScalaOptions = Def.setting(CrossVersion.partialVersion(scalaVersion.value).get match { + case (3, 3) => "-Wconf:cat=unused-nowarn:s,cat=other-shadowing:s,any:e" + case (2, 13) => "-Wconf:any:e,cat=unused-nowarn:s,cat=other-shadowing:s" + case (2, 12) => "-Wconf:cat=unused-nowarn:s,any:e" }) lazy val nowarnSettings = Seq(