fix -Wconf to match new semantics

Override order reversed, see also https://github.com/scala/scala/releases
apache · Jan 3, 2025 · 4c2d74d · 4c2d74d
1 parent bcf1c27
commit 4c2d74d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 13 deletions.
diff --git a/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorContextSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorContextSpec.scala
@@ -13,6 +13,7 @@
 
 package org.apache.pekko.actor.typed
 
+import scala.annotation.nowarn
 import scala.concurrent.duration._
 import scala.reflect.ClassTag
 
@@ -88,6 +89,8 @@ abstract class ActorContextSpec extends ScalaTestWithActorTestKit with AnyWordSp
   "An ActorContext" must {
 
     "be usable from Behavior.interpretMessage" in {
+      // possibly fixed in 2.13.6 https://github.com/scala/bug/issues/13041
+      @nowarn("cat=unused-locals")
       // compilation only
       lazy val b: Behavior[String] = Behaviors.receive { (context, message) =>
         Behavior.interpretMessage(b, context, message)

diff --git a/bench-jmh/src/main/scala/org/apache/pekko/actor/RequestResponseActors.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/RequestResponseActors.scala
@@ -85,7 +85,7 @@ object RequestResponseActors {
     val fullPathToDispatcher = "pekko.actor." + dispatcher
     val latch = new CountDownLatch(numActors)
     val actorsPairs = for {
-      i <- (1 to (numActors / 2)).toVector
+      _ <- (1 to (numActors / 2)).toVector
       userQueryActor = system.actorOf(
         UserQueryActor.props(latch, numQueriesPerActor, numUsersInDBPerActor).withDispatcher(fullPathToDispatcher))
       userServiceActor = system.actorOf(

diff --git a/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala
@@ -855,7 +855,7 @@ class DistributedPubSubMediator(settings: DistributedPubSubSettings)
     val topicPrefix = self.path.toStringWithoutAddress
     (for {
       (_, bucket) <- registry
-      (key, value) <- bucket.content.toSeq
+      (key, _) <- bucket.content.toSeq
       if key.startsWith(topicPrefix)
       topic = key.substring(topicPrefix.length + 1)
       if !topic.contains('/') // exclude group topics

diff --git a/...istence/src/main/scala/org/apache/pekko/persistence/serialization/MessageSerializer.scala b/...istence/src/main/scala/org/apache/pekko/persistence/serialization/MessageSerializer.scala
@@ -149,6 +149,7 @@ class MessageSerializer(val system: ExtendedActorSystem) extends BaseSerializer
       else None)
   }
 
+  @nowarn("msg=deprecated")
   def persistentFSMSnapshot(persistentFSMSnapshot: mf.PersistentFSMSnapshot): PersistentFSMSnapshot[Any] = {
     PersistentFSMSnapshot(
       persistentFSMSnapshot.getStateIdentifier,

diff --git a/...ce/src/test/scala/org/apache/pekko/persistence/serialization/SnapshotSerializerSpec.scala b/...ce/src/test/scala/org/apache/pekko/persistence/serialization/SnapshotSerializerSpec.scala
@@ -17,13 +17,16 @@
 
 package org.apache.pekko.persistence.serialization
 
+import annotation.nowarn
+
 import org.apache.pekko
 import pekko.persistence.fsm.PersistentFSM.PersistentFSMSnapshot
 import pekko.serialization.SerializationExtension
 import pekko.testkit.PekkoSpec
 
 import java.util.Base64
 
+@nowarn("msg=deprecated")
 private[serialization] object SnapshotSerializerTestData {
   val fsmSnapshot = PersistentFSMSnapshot[String]("test-identifier", "test-data", None)
   // https://github.com/apache/pekko/pull/837#issuecomment-1847320309

diff --git 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, _)  => "-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(
@@ -101,16 +102,18 @@ object PekkoDisciplinePlugin extends AutoPlugin {
   lazy val docs =
     Seq(
       Compile / scalacOptions -= defaultScalaOptions.value,
-      Compile / scalacOptions ++= (
-        if (scalaVersion.value.startsWith("3.")) Nil
-        else Seq("-Wconf:cat=unused:s,cat=deprecation:s,cat=unchecked:s,any:e")
-      ),
+      Compile / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value).get match {
+        case (3, _) => Seq("-Wconf:cat=unused:s,cat=deprecation,cat=other-shadowing:s,any:e")
+        case (2, 13) => Seq("-Wconf:any:e,cat=unused:s,cat=deprecation:s,cat=unchecked:s")
+        case (2, 12) => Seq("-Wconf:cat=unused:s,cat=deprecation:s,cat=unchecked:s,any:e")
+      }),
       Test / scalacOptions --= Seq("-Xlint", "-unchecked", "-deprecation"),
       Test / scalacOptions -= defaultScalaOptions.value,
-      Test / scalacOptions ++= (
-        if (scalaVersion.value.startsWith("3.")) Nil
-        else Seq("-Wconf:cat=unused:s,cat=deprecation:s,cat=unchecked:s,any:e")
-      ),
+      Test / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value).get match {
+        case (3, _) => Seq("-Wconf:cat=unused:s,cat=deprecation,cat=other-shadowing:s,any:e")
+        case (2, 13) => Seq("-Wconf:any:e,cat=unused:s,cat=deprecation:s,cat=unchecked:s")
+        case (2, 12) => Seq("-Wconf:cat=unused:s,cat=deprecation:s,cat=unchecked:s,any:e")
+      }),
       Compile / doc / scalacOptions := Seq())
 
   lazy val disciplineSettings =