bump: scala-library 2.13.13 (was 2.13.12) (#1143)

* Fix some new warnings and relax compiler about some other --------- Co-authored-by: Johan Andrén <johan@markatta.com>
akka · Mar 21, 2024 · 2bff21b · 2bff21b
1 parent 140ffce
commit 2bff21b
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 25 deletions.
diff --git a/...on-grpc-tests/src/test/scala/akka/projection/grpc/internal/EventProducerServiceSpec.scala b/...on-grpc-tests/src/test/scala/akka/projection/grpc/internal/EventProducerServiceSpec.scala
@@ -177,15 +177,15 @@ object EventProducerServiceSpec {
 
   private def createEnvelope(pid: PersistenceId, seqNr: Long, evt: String, origin: String): EventEnvelope[String] =
     createEnvelope(pid, seqNr, evt)
-      .withMetadata(ReplicatedEventMetadata(ReplicaId(origin), seqNr, VersionVector.empty, false))
+      .withMetadata(ReplicatedEventMetadata(ReplicaId(origin), seqNr, VersionVector.empty, concurrent = false))
 
   private def createBacktrackingEnvelope(
       pid: PersistenceId,
       seqNr: Long,
       evt: String,
       origin: String): EventEnvelope[String] =
     createEnvelope(pid, seqNr, evt, source = "BT")
-      .withMetadata(ReplicatedEventMetadata(ReplicaId(origin), seqNr, VersionVector.empty, false))
+      .withMetadata(ReplicatedEventMetadata(ReplicaId(origin), seqNr, VersionVector.empty, concurrent = false))
 
 }
 

diff --git a/...on-grpc/src/main/scala/akka/projection/grpc/replication/javadsl/ReplicationSettings.scala b/...on-grpc/src/main/scala/akka/projection/grpc/replication/javadsl/ReplicationSettings.scala
@@ -77,10 +77,10 @@ object ReplicationSettings {
       parallelUpdates,
       replicationProjectionProvider,
       Optional.empty(),
-      false,
-      identity,
-      _ => true,
-      Collections.emptyList,
+      edgeReplication = false,
+      configureEntity = identity,
+      producerFilter = _ => true,
+      initialConsumerFilter = Collections.emptyList,
       // no system config to get defaults from, repeating config file defaults
       edgeReplicationDeliveryRetries = 3,
       edgeReplicationDeliveryMinBackoff = 250.millis.asJava,
@@ -137,10 +137,10 @@ object ReplicationSettings {
       parallelUpdates = config.getInt("parallel-updates"),
       replicationProjectionProvider = replicationProjectionProvider,
       Optional.empty(),
-      false,
-      identity,
-      _ => true,
-      Collections.emptyList,
+      edgeReplication = false,
+      configureEntity = identity,
+      producerFilter = _ => true,
+      initialConsumerFilter = Collections.emptyList,
       edgeReplicationDeliveryRetries = replicationConfig.getInt("edge-replication-delivery-retries"),
       edgeReplicationDeliveryMinBackoff = replicationConfig.getDuration("edge-replication-delivery-min-backoff"),
       edgeReplicationDeliveryMaxBackoff = replicationConfig.getDuration("edge-replication-delivery-max-backoff"))

diff --git a/...ojection-slick-integration/src/test/scala/akka/projection/slick/SlickProjectionSpec.scala b/...ojection-slick-integration/src/test/scala/akka/projection/slick/SlickProjectionSpec.scala
@@ -587,7 +587,7 @@ class SlickProjectionSpec
                       fail(s"Envelope has already been verified at least twice for offset $o")
                     case Some(state) if state.envReceived =>
                       acc + (o -> state.copy(verifyCount = state.verifyCount + 1))
-                    case None => acc + (o -> VerifyState(1, false))
+                    case None => acc + (o -> VerifyState(1, envReceived = false))
                     case _    => throw new IllegalStateException
                   }
                 case e: Envelope =>

diff --git a/project/AkkaDisciplinePlugin.scala b/project/AkkaDisciplinePlugin.scala
@@ -36,7 +36,7 @@ object AkkaDisciplinePlugin extends AutoPlugin {
                 "-Ywarn-nullary-override",
                 "-Ywarn-nullary-unit",
                 "-Ypartial-unification",
-                "-Yno-adapted-args")
+                "-Yno-adapted-args") + noWarnSettings
             case _ =>
               Nil
           }).toSeq,
@@ -51,6 +51,8 @@ object AkkaDisciplinePlugin extends AutoPlugin {
       Seq(Compile / scalacOptions += "-deprecation")
     }
 
+  val noWarnSettings = "-Wconf:cat=lint-deprecation:s"
+
   val testUndicipline = Seq("-Ywarn-dead-code" // '???' used in compile only specs
   )
   val testsExtraUndicipline = Seq("-Wconf:msg=missing interpolator:s")

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -5,7 +5,7 @@ import sbt._
 
 object Dependencies {
 
-  val Scala213 = "2.13.12"
+  val Scala213 = "2.13.13"
   val Scala3 = "3.3.3"
 
   val Scala2Versions = Seq(Scala213)

diff --git a/samples/grpc/iot-service-scala/build.sbt b/samples/grpc/iot-service-scala/build.sbt
@@ -6,7 +6,7 @@ licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 Compile / scalacOptions ++= Seq(
   "-release:11",

diff --git a/samples/grpc/local-drone-control-scala/autoscaling/simulator/build.sbt b/samples/grpc/local-drone-control-scala/autoscaling/simulator/build.sbt
@@ -1,14 +1,11 @@
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 enablePlugins(GatlingPlugin)
 
 libraryDependencies ++= Seq(
   "io.gatling.highcharts" % "gatling-charts-highcharts" % "3.9.5" % Test,
   "io.gatling" % "gatling-test-framework" % "3.9.5" % Test,
   "com.github.phisgr" % "gatling-grpc" % "0.16.0" % Test,
-  "com.thesamet.scalapb" %% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion % "protobuf"
-)
+  "com.thesamet.scalapb" %% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion % "protobuf")
 
-Test / PB.targets := Seq(
-  scalapb.gen() -> (Test / sourceManaged).value / "scalapb"
-)
+Test / PB.targets := Seq(scalapb.gen() -> (Test / sourceManaged).value / "scalapb")
diff --git a/samples/grpc/local-drone-control-scala/build.sbt b/samples/grpc/local-drone-control-scala/build.sbt
@@ -6,7 +6,7 @@ licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 Compile / scalacOptions ++= Seq(
   "-release:11",

diff --git a/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt b/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt
@@ -6,7 +6,7 @@ licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 Compile / scalacOptions ++= Seq(
   "-release:11",

diff --git a/samples/grpc/shopping-analytics-service-scala/build.sbt b/samples/grpc/shopping-analytics-service-scala/build.sbt
@@ -6,7 +6,7 @@ licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 Compile / scalacOptions ++= Seq(
   "-target:11",

diff --git a/samples/grpc/shopping-cart-service-scala/build.sbt b/samples/grpc/shopping-cart-service-scala/build.sbt
@@ -6,7 +6,7 @@ licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 Compile / scalacOptions ++= Seq(
   "-target:11",

diff --git a/samples/replicated/shopping-cart-service-scala/build.sbt b/samples/replicated/shopping-cart-service-scala/build.sbt
@@ -6,7 +6,7 @@ licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")
 
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
-scalaVersion := "2.13.12"
+scalaVersion := "2.13.13"
 
 Compile / scalacOptions ++= Seq(
   "-release",