From 3a4dabffe9db1b518b675915af91762aac61afed Mon Sep 17 00:00:00 2001 From: Quinn Klassen Date: Mon, 6 Nov 2023 09:41:20 -0800 Subject: [PATCH] Update grpc gen --- build.gradle | 2 +- temporal-serviceclient/build.gradle | 2 +- temporal-test-server/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 9ad8be560..b3d7d346c 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ allprojects { ext { // Platforms - grpcVersion = '1.54.1' // [1.38.0,) Needed for io.grpc.protobuf.services.HealthStatusManager + grpcVersion = project.hasProperty("edgeDepsTest") ? '1.59.0' : '1.54.1' // [1.38.0,) Needed for io.grpc.protobuf.services.HealthStatusManager jacksonVersion = '2.14.2' // [2.9.0,) // we don't upgrade to 1.10.x because it requires kotlin 1.6. Users may use 1.10.x in their environments though. micrometerVersion = project.hasProperty("edgeDepsTest") ? '1.10.5' : '1.9.9' // [1.0.0,) diff --git a/temporal-serviceclient/build.gradle b/temporal-serviceclient/build.gradle index f476f4890..4c6a8f748 100644 --- a/temporal-serviceclient/build.gradle +++ b/temporal-serviceclient/build.gradle @@ -64,7 +64,7 @@ protobuf { } plugins { grpc { - artifact = 'io.grpc:protoc-gen-grpc-java:1.34.1' + (System.getProperty("os.arch") == 'aarch64' && System.getProperty("os.name") == 'Mac OS X' ? ':osx-x86_64' : '') + artifact = 'io.grpc:protoc-gen-grpc-java:1.36.3' + (System.getProperty("os.arch") == 'aarch64' && System.getProperty("os.name") == 'Mac OS X' ? ':osx-x86_64' : '') } } generateProtoTasks { diff --git a/temporal-test-server/build.gradle b/temporal-test-server/build.gradle index a6bb98f94..ad0225239 100644 --- a/temporal-test-server/build.gradle +++ b/temporal-test-server/build.gradle @@ -66,7 +66,7 @@ protobuf { } plugins { grpc { - artifact = 'io.grpc:protoc-gen-grpc-java:1.34.1' + (System.getProperty("os.arch") == 'aarch64' && System.getProperty("os.name") == 'Mac OS X' ? ':osx-x86_64' : '') + artifact = 'io.grpc:protoc-gen-grpc-java:1.36.3' + (System.getProperty("os.arch") == 'aarch64' && System.getProperty("os.name") == 'Mac OS X' ? ':osx-x86_64' : '') } } generateProtoTasks {