Merge branch 'LesnyRumcajs:master' into fix-dart-bench

LesnyRumcajs · Jul 19, 2023 · 8622727 · 8622727
2 parents 52256dd + 03e7e70
commit 8622727
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 24 deletions.
diff --git a/go_grpc_bench/go.mod b/go_grpc_bench/go.mod
@@ -4,10 +4,16 @@ go 1.19
 
 require (
 	go.uber.org/automaxprocs v1.5.1
-	golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094
-	google.golang.org/genproto v0.0.0-20220902135211-223410557253
-	google.golang.org/grpc v1.49.0
-	google.golang.org/protobuf v1.28.1
+	google.golang.org/grpc v1.53.0
+)
+
+require (
+	github.com/golang/protobuf v1.5.2 // indirect
+	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
+	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
 )
 
 replace local => ./
diff --git a/go_vtgrpc_bench/go.mod b/go_vtgrpc_bench/go.mod
@@ -3,11 +3,18 @@ module example
 go 1.19
 
 require (
+	github.com/planetscale/vtprotobuf v0.4.0
 	go.uber.org/automaxprocs v1.5.1
-	golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094
-	google.golang.org/genproto v0.0.0-20220902135211-223410557253
-	google.golang.org/grpc v1.49.0
-	google.golang.org/protobuf v1.28.1
+	google.golang.org/grpc v1.53.0
+)
+
+require (
+	github.com/golang/protobuf v1.5.2 // indirect
+	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
+	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
 )
 
 replace local => ./
diff --git a/java_micronaut_bench/build.gradle b/java_micronaut_bench/build.gradle
@@ -1,13 +1,17 @@
 plugins {
     id("com.github.johnrengelman.shadow") version "7.0.0"
-    id("io.micronaut.application") version "3.5.3"
+    id("io.micronaut.application") version "4.0.0"
     id("com.google.protobuf") version "0.8.15"
+    id 'idea'
 }
 
 version = "0.1"
 group = "com.example"
 
 repositories {
+    maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+      mavenContent { snapshotsOnly() }
+    }
     mavenCentral()
 }
 
@@ -19,13 +23,17 @@ micronaut {
 }
 
 dependencies {
-    implementation("io.micronaut:micronaut-runtime")
+    implementation("io.micronaut:micronaut-context")
+    implementation 'javax.inject:javax.inject:1'
     implementation("io.micronaut.grpc:micronaut-grpc-runtime")
+    implementation("io.micronaut.grpc:micronaut-grpc-server-runtime")
+    implementation("io.micronaut.discovery:micronaut-discovery-client")
     implementation("javax.annotation:javax.annotation-api")
-    implementation("io.grpc:grpc-protobuf:1.49.0")
-    implementation("io.grpc:grpc-stub:1.49.0")
+    implementation("io.grpc:grpc-protobuf:1.56.1")
+    implementation("io.grpc:grpc-stub:1.56.1")
+    // implementation("io.micronaut.platform:micronaut-platform:4.0.0")
+    implementation 'io.micronaut:micronaut-inject'
     runtimeOnly("ch.qos.logback:logback-classic")
-    implementation("io.micronaut:micronaut-validation")
 }
 
 
@@ -34,8 +42,8 @@ application {
 }
 
 java {
-    sourceCompatibility = JavaVersion.toVersion("11")
-    targetCompatibility = JavaVersion.toVersion("11")
+    sourceCompatibility = JavaVersion.toVersion("17")
+    targetCompatibility = JavaVersion.toVersion("17")
 }
 
 sourceSets {
@@ -48,9 +56,9 @@ sourceSets {
 }
 
 protobuf {
-    protoc { artifact = "com.google.protobuf:protoc:3.21.5" }
+    protoc { artifact = "com.google.protobuf:protoc:3.23.4" }
     plugins {
-        grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.49.0" }
+        grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.56.1" }
     }
     generateProtoTasks {
         all()*.plugins { grpc {} }

diff --git a/java_micronaut_bench/settings.gradle b/java_micronaut_bench/settings.gradle
@@ -0,0 +1,10 @@
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+    }
+    versionCatalogs {
+        create("mn") {
+            from("io.micronaut.platform:micronaut-platform:4.0.0")
+        }
+    }
+}
diff --git a/scala_akka_bench/build.sbt b/scala_akka_bench/build.sbt
@@ -26,7 +26,7 @@ libraryDependencies ++= Seq(
   "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.2.15" % Test
+  "org.scalatest" %% "scalatest" % "3.2.16" % Test
 )
 
 // Akka and Google provided proto files seem to differ a bit so we need to choose

diff --git a/scala_akka_bench/project/build.properties b/scala_akka_bench/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.2
+sbt.version=1.8.3
diff --git a/scala_akka_bench/project/plugins.sbt b/scala_akka_bench/project/plugins.sbt
@@ -1,5 +1,5 @@
 addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.3.2")
 
-addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % "0.1.6")
+addSbtPlugin("com.github.sbt" % "sbt-javaagent" % "0.1.7")
 
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1")
diff --git a/scala_fs2_bench/project/build.properties b/scala_fs2_bench/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.2
+sbt.version=1.8.3
diff --git 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.1")
+addSbtPlugin("org.typelevel" % "sbt-fs2-grpc" % "2.7.4")
 
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1")
diff --git a/scala_zio_bench/build.sbt b/scala_zio_bench/build.sbt
@@ -6,7 +6,7 @@ scalaVersion := "2.13.11"
 
 run / fork := true
 
-val grpcVersion = "1.52.1"
+val grpcVersion = "1.56.1"
 
 Compile / PB.targets := Seq(
     scalapb.gen(grpc = true) -> (Compile / sourceManaged).value,

diff --git a/scala_zio_bench/project/build.properties b/scala_zio_bench/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.2
+sbt.version=1.8.3