Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump: scala-library 2.13.15 (was 2.13.14) #1207

Merged
merged 3 commits into from
Oct 2, 2024
Merged

bump: scala-library 2.13.15 (was 2.13.14) #1207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54fbb25
bump: scala-library 2.13.15 (was 2.13.14)
scala-steward Sep 28, 2024
b807463
explicit longs
johanandren Sep 30, 2024
771bece
Merge branch 'main' into update/scala-library-2.13.15
johanandren Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...2dbc-integration/src/test/scala/akka/projection/r2dbc/R2dbcTimestampOffsetStoreSpec.scala
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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/local-drone-control-scala/autoscaling/simulator/build.sbt
View file
Open in desktop
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
View file
Open in desktop
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/restaurant-drone-deliveries-service-scala/build.sbt
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading