diff --git a/java_aot_bench/Dockerfile b/java_aot_bench/Dockerfile index 106ccee8..31e37966 100644 --- a/java_aot_bench/Dockerfile +++ b/java_aot_bench/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/graalvm/graalvm-ce:ol8-java17-22.2.0-b1 as rel +FROM ghcr.io/graalvm/graalvm-ce:ol8-java17-22.3.3 as rel WORKDIR /app COPY java_aot_bench /app diff --git a/java_openj9_grpc_gencon_bench/Dockerfile b/java_openj9_grpc_gencon_bench/Dockerfile index 99e5121f..d776d1cb 100644 --- a/java_openj9_grpc_gencon_bench/Dockerfile +++ b/java_openj9_grpc_gencon_bench/Dockerfile @@ -1,4 +1,4 @@ -FROM ibm-semeru-runtimes:open-18.0.2_9-jdk +FROM ibm-semeru-runtimes:open-23.0.1_11-jdk WORKDIR /app COPY java_hotspot_grpc_sgc_bench/ /app diff --git a/java_quarkus_native_bench/Dockerfile b/java_quarkus_native_bench/Dockerfile index 8e663736..5049b033 100644 --- a/java_quarkus_native_bench/Dockerfile +++ b/java_quarkus_native_bench/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/graalvm/graalvm-ce:ol8-java17-22.2.0-b1 as rel +FROM ghcr.io/graalvm/graalvm-ce:ol8-java17-22.3.3 as rel WORKDIR /app diff --git a/python_async_grpc_bench/Dockerfile b/python_async_grpc_bench/Dockerfile index 1ae8fd00..918048bf 100644 --- a/python_async_grpc_bench/Dockerfile +++ b/python_async_grpc_bench/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11-slim +FROM python:3.13-slim WORKDIR /app COPY python_async_grpc_bench /app diff --git a/python_grpc_bench/Dockerfile b/python_grpc_bench/Dockerfile index 231255fd..8b205b77 100644 --- a/python_grpc_bench/Dockerfile +++ b/python_grpc_bench/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11-slim +FROM python:3.13-slim WORKDIR /app COPY python_grpc_bench /app diff --git a/scala_akka_bench/Dockerfile b/scala_akka_bench/Dockerfile index 096675dd..3c204a1a 100644 --- a/scala_akka_bench/Dockerfile +++ b/scala_akka_bench/Dockerfile @@ -1,4 +1,4 @@ -FROM hseeberger/scala-sbt:11.0.7_1.3.13_2.11.12 as BUILDER +FROM sbtscala/scala-sbt:eclipse-temurin-23.0.1_11_1.10.7_3.6.3 as BUILDER WORKDIR /app COPY scala_akka_bench /app diff --git a/scala_fs2_bench/Dockerfile b/scala_fs2_bench/Dockerfile index b47ba8bd..bf2d1ae4 100644 --- a/scala_fs2_bench/Dockerfile +++ b/scala_fs2_bench/Dockerfile @@ -1,4 +1,4 @@ -FROM hseeberger/scala-sbt:11.0.7_1.3.13_2.11.12 as BUILDER +FROM sbtscala/scala-sbt:eclipse-temurin-23.0.1_11_1.10.7_3.6.3 as BUILDER WORKDIR /app COPY scala_fs2_bench /app diff --git a/scala_fs2_bench/build.sbt b/scala_fs2_bench/build.sbt index 51e27574..2bd9bc01 100644 --- a/scala_fs2_bench/build.sbt +++ b/scala_fs2_bench/build.sbt @@ -2,7 +2,7 @@ name := "fs2-grpc-quickstart-scala" version := "1.0" -scalaVersion := "2.13.15" +scalaVersion := "2.13.16" run / fork := true diff --git a/scala_fs2_bench/project/plugins.sbt b/scala_fs2_bench/project/plugins.sbt index 838bb8e9..ce316eb7 100644 --- a/scala_fs2_bench/project/plugins.sbt +++ b/scala_fs2_bench/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("org.typelevel" % "sbt-fs2-grpc" % "2.7.16") +addSbtPlugin("org.typelevel" % "sbt-fs2-grpc" % "2.7.18") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0") diff --git a/scala_pekko_bench/Dockerfile b/scala_pekko_bench/Dockerfile index 9e4878e5..470a5bed 100644 --- a/scala_pekko_bench/Dockerfile +++ b/scala_pekko_bench/Dockerfile @@ -1,4 +1,4 @@ -FROM hseeberger/scala-sbt:11.0.7_1.3.13_2.11.12 as BUILDER +FROM sbtscala/scala-sbt:eclipse-temurin-23.0.1_11_1.10.7_3.6.3 as BUILDER WORKDIR /app COPY scala_pekko_bench/ /app diff --git a/scala_pekko_bench/build.sbt b/scala_pekko_bench/build.sbt index 3cfb7f46..cbdfd737 100644 --- a/scala_pekko_bench/build.sbt +++ b/scala_pekko_bench/build.sbt @@ -2,11 +2,11 @@ name := "pekko-grpc-quickstart-scala" version := "1.0" -scalaVersion := "2.13.15" +scalaVersion := "2.13.16" run / fork := true -val pekkoVersion = "1.1.2" +val pekkoVersion = "1.1.3" val pekkoHttpVersion = "1.1.0" enablePlugins(PekkoGrpcPlugin) @@ -26,7 +26,7 @@ libraryDependencies ++= Seq( "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion, "org.apache.pekko" %% "pekko-actor-testkit-typed" % pekkoVersion % Test, "org.apache.pekko" %% "pekko-stream-testkit" % pekkoVersion % Test, - "org.scalatest" %% "scalatest" % "3.2.15" % Test + "org.scalatest" %% "scalatest" % "3.2.19" % Test ) // pekko and Google provided proto files seem to differ a bit so we need to choose diff --git a/scala_pekko_bench/project/plugins.sbt b/scala_pekko_bench/project/plugins.sbt index 6aba9296..c6a10385 100644 --- a/scala_pekko_bench/project/plugins.sbt +++ b/scala_pekko_bench/project/plugins.sbt @@ -1,5 +1,3 @@ addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.1.1") -addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % "0.1.6") - addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0") diff --git a/scala_zio_bench/Dockerfile b/scala_zio_bench/Dockerfile index 6bdf904f..826cadc9 100644 --- a/scala_zio_bench/Dockerfile +++ b/scala_zio_bench/Dockerfile @@ -1,4 +1,4 @@ -FROM hseeberger/scala-sbt:11.0.7_1.3.13_2.11.12 as BUILDER +FROM sbtscala/scala-sbt:eclipse-temurin-23.0.1_11_1.10.7_3.6.3 as BUILDER WORKDIR /app COPY scala_zio_bench /app diff --git a/scala_zio_bench/build.sbt b/scala_zio_bench/build.sbt index 90b0d79e..7220a8a9 100644 --- a/scala_zio_bench/build.sbt +++ b/scala_zio_bench/build.sbt @@ -2,11 +2,11 @@ name := "zio-grpc-quickstart-scala" version := "1.0" -scalaVersion := "2.13.15" +scalaVersion := "2.13.16" run / fork := true -val grpcVersion = "1.63.2" +val grpcVersion = "1.64.0" Compile / PB.targets := Seq( scalapb.gen(grpc = true) -> (Compile / sourceManaged).value, @@ -22,6 +22,6 @@ libraryDependencies ++= Seq( assembly / assemblyMergeStrategy := { case x if x.contains("io.netty.versions.properties") => MergeStrategy.discard case x => - val oldStrategy = (assemblyMergeStrategy in assembly).value + val oldStrategy = (assembly / assemblyMergeStrategy).value oldStrategy(x) } diff --git a/scala_zio_bench/project/plugins.sbt b/scala_zio_bench/project/plugins.sbt index 8ae2ed01..d66a77a4 100644 --- a/scala_zio_bench/project/plugins.sbt +++ b/scala_zio_bench/project/plugins.sbt @@ -1,4 +1,4 @@ -val zioGrpcVersion = "0.6.2" +val zioGrpcVersion = "0.6.3" addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7") diff --git a/swift_grpc_bench/Dockerfile b/swift_grpc_bench/Dockerfile index 0137592c..6d3e69fc 100644 --- a/swift_grpc_bench/Dockerfile +++ b/swift_grpc_bench/Dockerfile @@ -1,4 +1,4 @@ -FROM swift:5.8 AS builder +FROM swift:6.0.3 AS builder WORKDIR /app @@ -21,7 +21,7 @@ RUN protoc --proto_path=/app/proto/helloworld --plugin=/usr/local/bin/protoc-gen RUN swift package resolve RUN swift build -c release -Xswiftc -enforce-exclusivity=unchecked -FROM swift:5.8 +FROM swift:6.0.3 WORKDIR /app RUN mkdir /app/.build COPY --from=builder /app/.build /app/.build diff --git a/swift_grpc_bench/Package.swift b/swift_grpc_bench/Package.swift index 0bb8f712..d9ebb472 100644 --- a/swift_grpc_bench/Package.swift +++ b/swift_grpc_bench/Package.swift @@ -15,7 +15,7 @@ let package = Package( dependencies: [ // Dependencies declare other packages that this package depends on. // .package(url: /* package url */, from: "1.0.0"), - .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.17.0") + .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.24.2") ], targets: [ .target(