Skip to content

Commit

Permalink
bump: grpc-core, grpc-interop-testing, ... 1.60.2 (was 1.60.0) (#1904)
Browse files Browse the repository at this point in the history
* bump: grpc-core, grpc-interop-testing, ... 1.60.2 (was 1.60.0)
---------

Co-authored-by: Johan Andrén <[email protected]>
  • Loading branch information
scala-steward and johanandren authored Feb 27, 2024
1 parent 65989ff commit 7cf311f
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion benchmark-java/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ run / javaOptions ++= List("-Xms1g", "-Xmx1g", "-XX:+PrintGCDetails", "-XX:+Prin
// generate both client and server (default) in Java
akkaGrpcGeneratedLanguages := Seq(AkkaGrpc.Java)

val grpcVersion = "1.60.0" // checked synced by VersionSyncCheckPlugin
val grpcVersion = "1.60.2" // checked synced by VersionSyncCheckPlugin

val runtimeProject = ProjectRef(file("../"), "akka-grpc-runtime")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class AkkaGrpcPluginExtension {

static final String PROTOC_PLUGIN_SCALA_VERSION = "2.12"

static final String GRPC_VERSION = "1.60.0" // checked synced by VersionSyncCheckPlugin
static final String GRPC_VERSION = "1.60.2" // checked synced by VersionSyncCheckPlugin

static final String PLUGIN_CODE = 'com.lightbend.akka.grpc.gradle'

Expand Down
2 changes: 1 addition & 1 deletion plugin-tester-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<maven-exec-plugin.version>3.0.0</maven-exec-plugin.version>
<akka.http.cors.version>1.1.0</akka.http.cors.version>
<akka.version>2.9.0</akka.version>
<grpc.version>1.60.0</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<grpc.version>1.60.2</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
<build-helper-maven-plugin>3.3.0</build-helper-maven-plugin>
<protobuf-java.version>3.22.2</protobuf-java.version>
Expand Down
2 changes: 1 addition & 1 deletion plugin-tester-scala/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<maven.compiler.release>11</maven.compiler.release>
<akka.version>2.9.0</akka.version>
<akka.http.cors.version>0.4.2</akka.http.cors.version>
<grpc.version>1.60.0</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<grpc.version>1.60.2</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ object Dependencies {
val akkaHttp = "10.6.0"
val akkaHttpBinary = "10.6"

val grpc = "1.60.0" // checked synced by VersionSyncCheckPlugin
val grpc = "1.60.2" // checked synced by VersionSyncCheckPlugin

// Even referenced explicitly in the sbt-plugin's sbt-tests
// If changing this, remember to update protoc plugin version to align in
Expand Down
7 changes: 3 additions & 4 deletions sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ resolvers += "Akka library repository".at("https://repo.akka.io/maven")

organization := "com.lightbend.akka.grpc"

val grpcVersion = "1.60.0" // checked synced by VersionSyncCheckPlugin
val grpcVersion = "1.60.2" // checked synced by VersionSyncCheckPlugin

libraryDependencies ++= Seq(
"io.grpc" % "grpc-interop-testing" % grpcVersion % "protobuf-src",
Expand All @@ -26,9 +26,8 @@ enablePlugins(AkkaGrpcPlugin)
PB.generate / excludeFilter := new SimpleFileFilter((f: File) =>
f.getAbsolutePath.endsWith("google/protobuf/descriptor.proto") ||
f.getAbsolutePath.endsWith("google/protobuf/empty.proto") ||
// grpc-interop pulls in proto files with unfulfilled transitive deps it seems, so skip them as well
f.getParent.contains("envoy")
)
// grpc-interop pulls in proto files with unfulfilled transitive deps it seems, so skip them as well
f.getParent.contains("envoy"))

//#sources-both
// This is the default - both client and server
Expand Down

0 comments on commit 7cf311f

Please sign in to comment.