From 4ccced2835a8cdc2e0870eff06a9c16203b0e1e7 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 2 Oct 2024 09:01:07 +0200 Subject: [PATCH] bump: scala-library 2.13.15 (was 2.13.14) (#1207) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * bump: scala-library 2.13.15 (was 2.13.14) * explicit longs --------- Co-authored-by: Johan Andrén --- .../projection/r2dbc/R2dbcTimestampOffsetStoreSpec.scala | 8 ++++---- project/Dependencies.scala | 2 +- samples/grpc/iot-service-scala/build.sbt | 2 +- .../autoscaling/simulator/build.sbt | 2 +- samples/grpc/local-drone-control-scala/build.sbt | 2 +- .../restaurant-drone-deliveries-service-scala/build.sbt | 2 +- samples/grpc/shopping-analytics-service-scala/build.sbt | 2 +- samples/grpc/shopping-cart-service-scala/build.sbt | 2 +- samples/replicated/shopping-cart-service-scala/build.sbt | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/akka-projection-r2dbc-integration/src/test/scala/akka/projection/r2dbc/R2dbcTimestampOffsetStoreSpec.scala b/akka-projection-r2dbc-integration/src/test/scala/akka/projection/r2dbc/R2dbcTimestampOffsetStoreSpec.scala index 8c9bf7316..e2bcc7991 100644 --- a/akka-projection-r2dbc-integration/src/test/scala/akka/projection/r2dbc/R2dbcTimestampOffsetStoreSpec.scala +++ b/akka-projection-r2dbc-integration/src/test/scala/akka/projection/r2dbc/R2dbcTimestampOffsetStoreSpec.scala @@ -543,7 +543,7 @@ class R2dbcTimestampOffsetStoreSpec .futureValue shouldBe RejectedBacktrackingSeqNr // it's keeping the inflight that are not in the "stored" state - offsetStore.getInflight() shouldBe Map("p1" -> 4L, "p3" -> 8, "p4" -> 2L, "p5" -> 8) + offsetStore.getInflight() shouldBe Map("p1" -> 4L, "p3" -> 8L, "p4" -> 2L, "p5" -> 8L) // and they are removed from inflight once they have been stored offsetStore .saveOffset(OffsetPidSeqNr(TimestampOffset(startTime.plusMillis(2), Map("p4" -> 2L)), "p4", 2L)) @@ -551,7 +551,7 @@ class R2dbcTimestampOffsetStoreSpec offsetStore .saveOffset(OffsetPidSeqNr(TimestampOffset(startTime.plusMillis(9), Map("p5" -> 8L)), "p5", 8L)) .futureValue - offsetStore.getInflight() shouldBe Map("p1" -> 4L, "p3" -> 8) + offsetStore.getInflight() shouldBe Map("p1" -> 4L, "p3" -> 8L) } "update inflight on error and re-accept element" in { @@ -689,7 +689,7 @@ class R2dbcTimestampOffsetStoreSpec offsetStore.addInflight(env7) // it's keeping the inflight that are not in the "stored" state - offsetStore.getInflight() shouldBe Map("p1" -> 4L, "p3" -> 20, "p4" -> 2L, "p5" -> 7) + offsetStore.getInflight() shouldBe Map("p1" -> 4L, "p3" -> 20L, "p4" -> 2L, "p5" -> 7L) // and they are removed from inflight once they have been stored offsetStore .saveOffset(OffsetPidSeqNr(TimestampOffset(startTime.plusMillis(2), Map("p4" -> 2L)), "p4", 2L)) @@ -697,7 +697,7 @@ class R2dbcTimestampOffsetStoreSpec offsetStore .saveOffset(OffsetPidSeqNr(TimestampOffset(startTime.plusMillis(9), Map("p5" -> 8L)), "p5", 8L)) .futureValue - offsetStore.getInflight() shouldBe Map("p1" -> 4L, "p3" -> 20) + offsetStore.getInflight() shouldBe Map("p1" -> 4L, "p3" -> 20L) } "evict old records" in { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index dde68e07e..084a729bd 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -5,7 +5,7 @@ import sbt._ object Dependencies { - val Scala213 = "2.13.14" + val Scala213 = "2.13.15" val Scala3 = "3.3.4" val Scala2Versions = Seq(Scala213) diff --git a/samples/grpc/iot-service-scala/build.sbt b/samples/grpc/iot-service-scala/build.sbt index 2abd1a9bd..e8adf480f 100644 --- 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.14" +scalaVersion := "2.13.15" 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 index 708269f72..695c358ce 100644 --- a/samples/grpc/local-drone-control-scala/autoscaling/simulator/build.sbt +++ b/samples/grpc/local-drone-control-scala/autoscaling/simulator/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.14" +scalaVersion := "2.13.15" enablePlugins(GatlingPlugin) diff --git a/samples/grpc/local-drone-control-scala/build.sbt b/samples/grpc/local-drone-control-scala/build.sbt index a12522c5f..03985c47d 100644 --- 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.14" +scalaVersion := "2.13.15" 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 index 0074e3f34..c3fa3ec33 100644 --- 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.14" +scalaVersion := "2.13.15" 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 index 5b212bc92..f939696f3 100644 --- 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.14" +scalaVersion := "2.13.15" 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 index 0148d0c56..9e9ebf9ce 100644 --- 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.14" +scalaVersion := "2.13.15" 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 index 68b3c3218..4287185d7 100644 --- 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.14" +scalaVersion := "2.13.15" Compile / scalacOptions ++= Seq( "-release",