Skip to content

Commit

Permalink
bump: scala-library 2.13.15 (was 2.13.14) (#1207)
Browse files Browse the repository at this point in the history
* bump: scala-library 2.13.15 (was 2.13.14)

* explicit longs

---------

Co-authored-by: Johan Andrén <johan@markatta.com>
  • Loading branch information
scala-steward and johanandren authored Oct 2, 2024
1 parent 38e01c5 commit 4ccced2
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -543,15 +543,15 @@ 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))
.futureValue
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 {
Expand Down Expand Up @@ -689,15 +689,15 @@ 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))
.futureValue
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 {
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion samples/grpc/iot-service-scala/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scalaVersion := "2.13.14"
scalaVersion := "2.13.15"

enablePlugins(GatlingPlugin)

Expand Down
2 changes: 1 addition & 1 deletion samples/grpc/local-drone-control-scala/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion samples/grpc/shopping-analytics-service-scala/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion samples/grpc/shopping-cart-service-scala/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion samples/replicated/shopping-cart-service-scala/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 4ccced2

Please sign in to comment.