Skip to content

Commit 2eaa50b

Browse files
authored
bump: Akka 25.10 versions (#2375)
* Akka 2.10.11 * Akka gRPC 2.5.8 * Alpakka 10.0.0 * Alpakka Kafka 8.0.0 * Akka Persistence R2DBC 1.3.8 * Akka Projection 1.6.16 * Scala 2.13.17 * Scala 3.3.7 * javafmtAll...
1 parent edb7288 commit 2eaa50b

File tree

48 files changed

+1306
-1144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1306
-1144
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -848,9 +848,9 @@ jobs:
848848
cd samples/${DIR}
849849
echo "Running sbt on ${DIR} with SDK version: '$SDK_VERSION'"
850850
echo "==== Testing with Scala 2.13 ===="
851-
sbt -Dkalix-sdk.version=$SDK_VERSION '++2.13.14! Test/compile'
851+
sbt -Dkalix-sdk.version=$SDK_VERSION '++2.13.17! Test/compile'
852852
echo "==== Testing with Scala 3 ===="
853-
sbt -Dkalix-sdk.version=$SDK_VERSION 'clean; ++3.3.3! Test/compile'
853+
sbt -Dkalix-sdk.version=$SDK_VERSION 'clean; ++3.3.7! Test/compile'
854854
855855
- name: sbt test
856856
if: matrix.test
@@ -862,11 +862,11 @@ jobs:
862862
cd samples/${DIR}
863863
${PRE_CMD}
864864
echo "==== Testing with Scala 2.13 ===="
865-
sbt -Dkalix-sdk.version=$SDK_VERSION '++2.13.14! test'
865+
sbt -Dkalix-sdk.version=$SDK_VERSION '++2.13.17! test'
866866
echo "==== Removing docker containers ===="
867867
docker ps -q | xargs -r docker stop
868868
echo "==== Testing with Scala 3 ===="
869-
sbt -Dkalix-sdk.version=$SDK_VERSION 'clean; ++3.3.3! test'
869+
sbt -Dkalix-sdk.version=$SDK_VERSION 'clean; ++3.3.7! test'
870870
871871
- name: rm & sbt Test/compile
872872
env:
@@ -876,6 +876,6 @@ jobs:
876876
cd samples/${DIR}
877877
echo "==== Verifying that generated unmanaged sources compile with Scala 2.13 ===="
878878
rm -rf src/main/scala src/test/scala src/it/scala
879-
sbt -Dkalix-sdk.version=$SDK_VERSION '++2.13.14! Test/compile'
879+
sbt -Dkalix-sdk.version=$SDK_VERSION '++2.13.17! Test/compile'
880880
echo "==== Verifying that generated unmanaged sources compile with Scala 3 ===="
881-
sbt -Dkalix-sdk.version=$SDK_VERSION 'clean; ++3.3.3! Test/compile'
881+
sbt -Dkalix-sdk.version=$SDK_VERSION 'clean; ++3.3.7! Test/compile'

project/Dependencies.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ object Dependencies {
1313
}
1414

1515
// changing the Scala version of the Java SDK affects end users
16-
val ScalaVersion = "2.13.14"
16+
val ScalaVersion = "2.13.17"
1717
val ScalaVersionForTooling = "2.12.19"
18-
val Scala3Version = "3.3.3"
18+
val Scala3Version = "3.3.7"
1919
val CrossScalaVersions = Seq(ScalaVersion, Scala3Version)
2020

2121
val ProtobufVersion = akka.grpc.gen.BuildInfo.googleProtobufVersion
2222

23-
val AkkaVersion = "2.10.9"
24-
val AkkaHttpVersion = "10.7.2" // Note: should at least the Akka HTTP version required by Akka gRPC
23+
val AkkaVersion = "2.10.11"
24+
val AkkaHttpVersion = "10.7.3" // Note: should at least the Akka HTTP version required by Akka gRPC
2525
val ScalaTestVersion = "3.2.14"
2626
// https://github.com/akka/akka/blob/main/project/Dependencies.scala#L31
2727
val JacksonVersion = "2.18.4"
@@ -117,7 +117,7 @@ object Dependencies {
117117
jacksonJsr310,
118118
jacksonParameterNames)
119119

120-
val devTools = deps ++= Seq(scalaCollectionCompat, "com.typesafe" % "config" % "1.4.2", scalaTest % Test)
120+
val devTools = deps ++= Seq(scalaCollectionCompat, "com.typesafe" % "config" % "1.4.5", scalaTest % Test)
121121

122122
val javaSdk = deps ++= sdkDeps
123123

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
22
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
33
// even updated `akka-grpc.version` in pom.xml files
4-
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.7")
4+
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.8")
55
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0")
66
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
77
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0")

samples/scala-protobuf-doc-snippets/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
44
organizationHomepage := Some(url("https://kalix.io"))
55
licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
66

7-
scalaVersion := "3.3.3"
7+
scalaVersion := "3.3.7"
88

99
enablePlugins(KalixPlugin, JavaAppPackaging, DockerPlugin)
1010
dockerBaseImage := "docker.io/library/eclipse-temurin:21.0.7_6-jre-noble"

samples/scala-protobuf-fibonacci-action/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
44
organizationHomepage := Some(url("https://kalix.io"))
55
licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
66

7-
scalaVersion := "3.3.3"
7+
scalaVersion := "3.3.7"
88

99
enablePlugins(KalixPlugin, JavaAppPackaging, DockerPlugin)
1010
dockerBaseImage := "docker.io/library/eclipse-temurin:21.0.7_6-jre-noble"

samples/scala-protobuf-first-service/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
organization := "com.example"
22

3-
scalaVersion := "3.3.3"
3+
scalaVersion := "3.3.7"
44

55
enablePlugins(KalixPlugin, JavaAppPackaging, DockerPlugin)
66
dockerBaseImage := "docker.io/library/eclipse-temurin:21.0.7_6-jre-noble"

samples/scala-protobuf-reliable-timers/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
44
organizationHomepage := Some(url("https://kalix.io"))
55
licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
66

7-
scalaVersion := "3.3.3"
7+
scalaVersion := "3.3.7"
88

99
enablePlugins(KalixPlugin, JavaAppPackaging, DockerPlugin)
1010
dockerBaseImage := "docker.io/library/eclipse-temurin:21.0.7_6-jre-noble"

samples/scala-protobuf-tracing/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ organization := "io.kalix.samples"
55
organizationHomepage := Some(url("https://kalix.io"))
66
licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
77

8-
scalaVersion := "3.3.3"
8+
scalaVersion := "3.3.7"
99

1010
enablePlugins(KalixPlugin, JavaAppPackaging, DockerPlugin)
1111
dockerBaseImage := "docker.io/library/eclipse-temurin:21.0.7_6-jre-noble"

samples/scala-protobuf-transfer-workflow-compensation/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
44
organizationHomepage := Some(url("https://kalix.io"))
55
licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
66

7-
scalaVersion := "3.3.3"
7+
scalaVersion := "3.3.7"
88

99
enablePlugins(KalixPlugin, JavaAppPackaging, DockerPlugin)
1010
dockerBaseImage := "docker.io/library/eclipse-temurin:21.0.7_6-jre-noble"

samples/scala-protobuf-transfer-workflow/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ organization := "io.kalix.samples"
44
organizationHomepage := Some(url("https://kalix.io"))
55
licenses := Seq(("CC0", url("https://creativecommons.org/publicdomain/zero/1.0")))
66

7-
scalaVersion := "3.3.3"
7+
scalaVersion := "3.3.7"
88

99
enablePlugins(KalixPlugin, JavaAppPackaging, DockerPlugin)
1010
dockerBaseImage := "docker.io/library/eclipse-temurin:21.0.7_6-jre-noble"

0 commit comments

Comments
 (0)