Merge remote-tracking branch 'origin/master' into scala_fs2

eigr · May 18, 2021 · da76354 · da76354
2 parents aaac311 + 5e89cbe
commit da76354
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/java_aot_bench/Dockerfile b/java_aot_bench/Dockerfile
@@ -10,4 +10,4 @@ RUN gu install native-image
 
 RUN native-image --no-server --static --no-fallback -jar /app/build/libs/app-0.1-all.jar
 
-ENTRYPOINT [ "/app/app-0.1-all" ]
+ENTRYPOINT [ "/app/hello-world-java" ]
diff --git a/scala_akka_bench/build.sbt b/scala_akka_bench/build.sbt
@@ -4,16 +4,20 @@ version := "1.0"
 
 scalaVersion := "2.13.2"
 
-lazy val akkaVersion = "2.6.8"
-lazy val akkaGrpcVersion = "1.0.0"
+run / fork := true
+
+lazy val akkaVersion = "2.6.9"
+lazy val akkaGrpcVersion = "1.1.1"
 
 enablePlugins(AkkaGrpcPlugin)
 
 libraryDependencies ++= Seq(
+  "ch.qos.logback" % "logback-classic" % "1.2.3",
   "com.typesafe.akka" %% "akka-actor-typed" % akkaVersion,
   "com.typesafe.akka" %% "akka-stream" % akkaVersion,
   "com.typesafe.akka" %% "akka-discovery" % akkaVersion,
   "com.typesafe.akka" %% "akka-pki" % akkaVersion,
+  "com.typesafe.akka" %% "akka-slf4j" % akkaVersion,
   "com.typesafe.akka" %% "akka-actor-testkit-typed" % akkaVersion % Test,
   "com.typesafe.akka" %% "akka-stream-testkit" % akkaVersion % Test,
   "org.scalatest" %% "scalatest" % "3.1.1" % Test

diff --git a/scala_akka_bench/project/plugins.sbt b/scala_akka_bench/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "1.0.0")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "1.1.1")
 
 addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % "0.1.5")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,4 @@ RUN gu install native-image

		RUN native-image --no-server --static --no-fallback -jar /app/build/libs/app-0.1-all.jar

		ENTRYPOINT [ "/app/app-0.1-all" ]
		ENTRYPOINT [ "/app/hello-world-java" ]