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.

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

[chore] updated #496

Merged
merged 1 commit into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion java_aot_bench/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion java_openj9_grpc_gencon_bench/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion java_quarkus_native_bench/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion python_async_grpc_bench/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11-slim
FROM python:3.13-slim

WORKDIR /app
COPY python_async_grpc_bench /app
Expand Down
2 changes: 1 addition & 1 deletion python_grpc_bench/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11-slim
FROM python:3.13-slim

WORKDIR /app
COPY python_grpc_bench /app
Expand Down
2 changes: 1 addition & 1 deletion scala_akka_bench/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion scala_fs2_bench/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion scala_fs2_bench/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name := "fs2-grpc-quickstart-scala"

version := "1.0"

scalaVersion := "2.13.15"
scalaVersion := "2.13.16"

run / fork := true

Expand Down
2 changes: 1 addition & 1 deletion scala_fs2_bench/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion scala_pekko_bench/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions scala_pekko_bench/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions scala_pekko_bench/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion scala_zio_bench/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions scala_zio_bench/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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)
}
2 changes: 1 addition & 1 deletion scala_zio_bench/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val zioGrpcVersion = "0.6.2"
val zioGrpcVersion = "0.6.3"

addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7")

Expand Down
4 changes: 2 additions & 2 deletions swift_grpc_bench/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM swift:5.8 AS builder
FROM swift:6.0.3 AS builder

WORKDIR /app

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion swift_grpc_bench/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading