This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-grpc.git
The following commit(s) were added to refs/heads/main by this push:
new f62fc6c9 Update grpc-core, grpc-interop-testing, ... to 1.68.0 (#367)
f62fc6c9 is described below
commit f62fc6c94a5df18d0acba883499bf2dca2daa18c
Author: scala-steward-asf[bot]
<147768647+scala-steward-asf[bot]@users.noreply.github.com>
AuthorDate: Sun Sep 22 10:42:41 2024 +0100
Update grpc-core, grpc-interop-testing, ... to 1.68.0 (#367)
* Update grpc-core, grpc-interop-testing, ... to 1.68.0
* set version in other build files
* fix interop compile issues
* javafmt
* Update GrpcJavaClientTester.java
---------
Co-authored-by: scala-steward-asf[bot]
<147768647+scala-steward-asf[bot]@users.noreply.github.com>
Co-authored-by: PJ Fanning <[email protected]>
---
benchmark-java/build.sbt | 2 +-
.../grpc/gradle/PekkoGrpcPluginExtension.groovy | 4 ++--
.../testing/integration2/GrpcJavaClientTester.java | 24 ++++++----------------
.../myapp/helloworld/grpc/RichErrorModelTest.java | 6 +-----
maven-plugin/src/main/maven/plugin.xml | 4 ++--
plugin-tester-java/pom.xml | 2 +-
plugin-tester-scala/pom.xml | 2 +-
project/Dependencies.scala | 4 ++--
.../sbt-test/gen-scala-server/00-interop/build.sbt | 2 +-
9 files changed, 17 insertions(+), 33 deletions(-)
diff --git a/benchmark-java/build.sbt b/benchmark-java/build.sbt
index c47d68e8..b7ffde60 100644
--- a/benchmark-java/build.sbt
+++ b/benchmark-java/build.sbt
@@ -14,7 +14,7 @@ run / javaOptions ++= List("-Xms1g", "-Xmx1g",
"-XX:+PrintGCDetails", "-XX:+Prin
// generate both client and server (default) in Java
pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
-val grpcVersion = "1.66.0" // checked synced by VersionSyncCheckPlugin
+val grpcVersion = "1.68.0" // checked synced by VersionSyncCheckPlugin
val runtimeProject = ProjectRef(file("../"), "runtime")
diff --git
a/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPluginExtension.groovy
b/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPluginExtension.groovy
index 629706c8..acafbadc 100644
---
a/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPluginExtension.groovy
+++
b/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPluginExtension.groovy
@@ -14,11 +14,11 @@ import org.gradle.api.Project
class PekkoGrpcPluginExtension {
- static final String PROTOC_VERSION = "3.25.4" // checked synced by
VersionSyncCheckPlugin
+ static final String PROTOC_VERSION = "3.25.5" // checked synced by
VersionSyncCheckPlugin
static final String PROTOC_PLUGIN_SCALA_VERSION = "2.12"
- static final String GRPC_VERSION = "1.66.0" // checked synced by
VersionSyncCheckPlugin
+ static final String GRPC_VERSION = "1.68.0" // checked synced by
VersionSyncCheckPlugin
static final String PLUGIN_CODE = 'org.apache.pekko.grpc.gradle'
diff --git
a/interop-tests/src/main/java/io/grpc/testing/integration2/GrpcJavaClientTester.java
b/interop-tests/src/main/java/io/grpc/testing/integration2/GrpcJavaClientTester.java
index adef1c96..e8358bbf 100644
---
a/interop-tests/src/main/java/io/grpc/testing/integration2/GrpcJavaClientTester.java
+++
b/interop-tests/src/main/java/io/grpc/testing/integration2/GrpcJavaClientTester.java
@@ -44,9 +44,7 @@ public class GrpcJavaClientTester implements ClientTester {
}
@Override
- public void cacheableUnary() {
- tester.cacheableUnary();
- }
+ public void cacheableUnary() {}
@Override
public void largeUnary() throws Exception {
@@ -94,32 +92,22 @@ public class GrpcJavaClientTester implements ClientTester {
}
@Override
- public void computeEngineCreds(String serviceAccount, String oauthScope)
throws Exception {
- tester.computeEngineCreds(serviceAccount, oauthScope);
- }
+ public void computeEngineCreds(String serviceAccount, String oauthScope)
throws Exception {}
@Override
public void serviceAccountCreds(String jsonKey, InputStream
credentialsStream, String authScope)
- throws Exception {
- tester.serviceAccountCreds(jsonKey, credentialsStream, authScope);
- }
+ throws Exception {}
@Override
- public void jwtTokenCreds(InputStream serviceAccountJson) throws Exception {
- tester.jwtTokenCreds(serviceAccountJson);
- }
+ public void jwtTokenCreds(InputStream serviceAccountJson) throws Exception {}
@Override
public void oauth2AuthToken(String jsonKey, InputStream credentialsStream,
String authScope)
- throws Exception {
- tester.oauth2AuthToken(jsonKey, credentialsStream, authScope);
- }
+ throws Exception {}
@Override
public void perRpcCreds(String jsonKey, InputStream credentialsStream,
String oauthScope)
- throws Exception {
- tester.perRpcCreds(jsonKey, credentialsStream, oauthScope);
- }
+ throws Exception {}
@Override
public void customMetadata() throws Exception {
diff --git
a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java
b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java
index 61d8d284..c5a15279 100644
---
a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java
+++
b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java
@@ -65,11 +65,7 @@ public class RichErrorModelTest extends JUnitSuite {
HelloRequest request =
HelloRequest.newBuilder().setName("Alice").build();
CompletionStage<HelloReply> response = client.sayHello(request);
StatusRuntimeException statusEx =
- response
- .toCompletableFuture()
- .handle(
- (res, ex) -> (StatusRuntimeException) ex)
- .get();
+ response.toCompletableFuture().handle((res, ex) ->
(StatusRuntimeException) ex).get();
com.google.rpc.Status status =
StatusProto.fromStatusAndTrailers(statusEx.getStatus(),
statusEx.getTrailers());
diff --git a/maven-plugin/src/main/maven/plugin.xml
b/maven-plugin/src/main/maven/plugin.xml
index df417942..18a8bc38 100644
--- a/maven-plugin/src/main/maven/plugin.xml
+++ b/maven-plugin/src/main/maven/plugin.xml
@@ -95,7 +95,7 @@
<extraGenerators implementation="java.util.List" default-value=""/>
<protoPaths
default-value="${project.basedir}/src/main/proto,${project.basedir}/src/main/protobuf">${pekko-grpc.protoPaths}</protoPaths>
<outputDirectory
default-value="${project.build.directory}/generated-sources">${pekko-grpc.outputDirectory}</outputDirectory>
- <protocVersion implementation="java.lang.String"
default-value="-v3.25.4">${pekko-grpc.protoc-version}</protocVersion> <!--
checked synced by VersionSyncCheckPlugin -->
+ <protocVersion implementation="java.lang.String"
default-value="-v3.25.5">${pekko-grpc.protoc-version}</protocVersion> <!--
checked synced by VersionSyncCheckPlugin -->
<includeStdTypes implementation="boolean" default-value="false" />
</configuration>
</mojo>
@@ -187,7 +187,7 @@
<extraGenerators implementation="java.util.List" default-value=""/>
<protoPaths
default-value="src/test/proto,src/test/protobuf">${pekko-grpc.protoPaths}</protoPaths>
<outputDirectory
default-value="target/generated-test-sources">${pekko-grpc.outputDirectory}</outputDirectory>
- <protocVersion implementation="java.lang.String"
default-value="-v3.25.4">${pekko-grpc.protoc-version}</protocVersion> <!--
checked synced by VersionSyncCheckPlugin -->
+ <protocVersion implementation="java.lang.String"
default-value="-v3.25.5">${pekko-grpc.protoc-version}</protocVersion> <!--
checked synced by VersionSyncCheckPlugin -->
<includeStdTypes implementation="boolean" default-value="false" />
</configuration>
</mojo>
diff --git a/plugin-tester-java/pom.xml b/plugin-tester-java/pom.xml
index 3f1e9f98..6d964945 100644
--- a/plugin-tester-java/pom.xml
+++ b/plugin-tester-java/pom.xml
@@ -25,7 +25,7 @@
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
<maven-exec-plugin.version>3.0.0</maven-exec-plugin.version>
<pekko.http.version>1.1.0-M1</pekko.http.version>
- <grpc.version>1.66.0</grpc.version> <!-- checked synced by
VersionSyncCheckPlugin -->
+ <grpc.version>1.68.0</grpc.version> <!-- checked synced by
VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
</properties>
diff --git a/plugin-tester-scala/pom.xml b/plugin-tester-scala/pom.xml
index e5283e21..0cd1328d 100644
--- a/plugin-tester-scala/pom.xml
+++ b/plugin-tester-scala/pom.xml
@@ -24,7 +24,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<pekko.version>1.1.1</pekko.version>
<pekko.http.version>1.1.0-M1</pekko.http.version>
- <grpc.version>1.66.0</grpc.version> <!-- checked synced by
VersionSyncCheckPlugin -->
+ <grpc.version>1.68.0</grpc.version> <!-- checked synced by
VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
</properties>
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 1dc6bafd..d8db70ac 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -32,11 +32,11 @@ object Dependencies {
val pekkoHttp = PekkoHttpDependency.version
val pekkoHttpBinary = pekkoHttp.take(3)
- val grpc = "1.66.0" // checked synced by VersionSyncCheckPlugin
+ val grpc = "1.68.0" // 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
// maven-plugin/src/main/maven/plugin.xml and
org.apache.pekko.grpc.sbt.PekkoGrpcPlugin
- val googleProtoc = "3.25.4" // checked synced by VersionSyncCheckPlugin
+ val googleProtoc = "3.25.5" // checked synced by VersionSyncCheckPlugin
val googleProtobufJava = "3.25.5"
val scalaTest = "3.2.19"
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
index 0f8e5ab8..1c697a46 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
@@ -13,7 +13,7 @@ scalaVersion := "2.12.20"
organization := "org.apache.pekko"
-val grpcVersion = "1.66.0" // checked synced by VersionSyncCheckPlugin
+val grpcVersion = "1.68.0" // checked synced by VersionSyncCheckPlugin
libraryDependencies ++= Seq(
"io.grpc" % "grpc-interop-testing" % grpcVersion % "protobuf-src",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
