diff --git a/distdir_deps.bzl b/distdir_deps.bzl index 1739a25c2a3c4a..48b7e4f85e16c8 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -121,16 +121,16 @@ DIST_DEPS = { ], }, "com_github_grpc_grpc": { - "archive": "v1.32.0.tar.gz", - "sha256": "f880ebeb2ccf0e47721526c10dd97469200e40b5f101a0d9774eb69efa0bd07a", - "strip_prefix": "grpc-1.32.0", + "archive": "v1.33.1.tar.gz", + "sha256": "58eaee5c0f1bd0b92ebe1fa0606ec8f14798500620e7444726afcaf65041cb63", + "strip_prefix": "grpc-1.33.1", "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.32.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.32.0.tar.gz", + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.33.1.tar.gz", + "https://github.com/grpc/grpc/archive/v1.33.1.tar.gz", ], "patch_args": ["-p1"], "patches": [ - "//third_party/grpc:grpc_1.32.0.patch", + "//third_party/grpc:grpc_1.33.1.patch", ], "used_in": [ "additional_distfiles", diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index a674d43d24bbf6..a47a8e90625086 100755 --- a/scripts/bootstrap/compile.sh +++ b/scripts/bootstrap/compile.sh @@ -27,7 +27,7 @@ fi GOOGLE_API_PROTOS="$(grep -o '".*\.proto"' third_party/googleapis/BUILD.bazel | sed 's/"//g' | sed 's|^|third_party/googleapis/|g')" PROTO_FILES=$(find third_party/remoteapis ${GOOGLE_API_PROTOS} third_party/pprof src/main/protobuf src/main/java/com/google/devtools/build/lib/buildeventstream/proto src/main/java/com/google/devtools/build/skyframe src/main/java/com/google/devtools/build/lib/skyframe/proto src/main/java/com/google/devtools/build/lib/bazel/debug src/main/java/com/google/devtools/build/lib/starlarkdebug/proto src/main/java/com/google/devtools/build/lib/packages/metrics/package_metrics.proto -name "*.proto") LIBRARY_JARS=$(find $ADDITIONAL_JARS third_party -name '*.jar' | grep -Fv JavaBuilder | grep -Fv third_party/guava/guava | grep -ve 'third_party/grpc/grpc.*jar' | tr "\n" " ") -GRPC_JAVA_VERSION=1.32.2 +GRPC_JAVA_VERSION=1.33.1 GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e ".*${GRPC_JAVA_VERSION}.*jar" | tr "\n" " ") GUAVA_VERSION=29.0 GUAVA_JARS=$(find third_party/guava -name '*.jar' | grep -e ".*${GUAVA_VERSION}.*jar" | tr "\n" " ") diff --git a/third_party/grpc/BUILD b/third_party/grpc/BUILD index 3bd85ba6b3f910..5b33e42ca210b5 100644 --- a/third_party/grpc/BUILD +++ b/third_party/grpc/BUILD @@ -18,7 +18,7 @@ load("//tools/distributions:distribution_rules.bzl", "distrib_java_import", "dis licenses(["notice"]) # Apache v2 -exports_files(["grpc_1.32.0.patch"]) +exports_files(["grpc_1.33.1.patch"]) package(default_visibility = ["//visibility:public"]) @@ -32,14 +32,14 @@ filegroup( distrib_jar_filegroup( name = "bootstrap-grpc-jars", srcs = [ - "grpc-api-1.32.2.jar", - "grpc-auth-1.32.2.jar", - "grpc-context-1.32.2.jar", - "grpc-core-1.32.2.jar", - "grpc-netty-1.32.2.jar", - "grpc-protobuf-1.32.2.jar", - "grpc-protobuf-lite-1.32.2.jar", - "grpc-stub-1.32.2.jar", + "grpc-api-1.33.1.jar", + "grpc-auth-1.33.1.jar", + "grpc-context-1.33.1.jar", + "grpc-core-1.33.1.jar", + "grpc-netty-1.33.1.jar", + "grpc-protobuf-1.33.1.jar", + "grpc-protobuf-lite-1.33.1.jar", + "grpc-stub-1.33.1.jar", ], enable_distributions = ["debian"], ) diff --git a/third_party/grpc/README.bazel.md b/third_party/grpc/README.bazel.md index c7a3ac2f8cb50f..19f0a8a8f658d0 100644 --- a/third_party/grpc/README.bazel.md +++ b/third_party/grpc/README.bazel.md @@ -1,30 +1,30 @@ # How to update the C++ sources of gRPC: 1. Update the gRPC definitions in WORKSPACE file, currently we use - https://github.com/grpc/grpc/archive/v1.32.2.tar.gz + https://github.com/grpc/grpc/archive/v1.33.1.tar.gz 2. Update the gRPC patch file if necessary, it mostly helps avoid unnecessary dependencies. 3. Update third_party/grpc/BUILD to redirect targets to @com_github_grpc_grpc if necessary. # How to update the BUILD/bzl sources of gRPC: 1. `git clone http://github.com/grpc/grpc.git` in a convenient directory -2. `git checkout ` (current is `v1.32.0`, commithash `414bb8322d`) +2. `git checkout ` (current is `v1.33.1`, commithash `054ff69350`) 3. `mkdir -p third_party/grpc/bazel` 4. `cp /bazel/{BUILD,cc_grpc_library.bzl,generate_cc.bzl,protobuf.bzl} third_party/grpc/bazel` 5. In the `third_party/grpc` directory, apply local patches: - `patch -p3 < bazel_1.32.0.patch` + `patch -p3 < bazel_1.33.1.patch` # How to update the Java plugin: -1. Checkout tag `v1.32.2` from https://github.com/grpc/grpc-java +1. Checkout tag `v1.33.1` from https://github.com/grpc/grpc-java 2. `cp -R /compiler/src/java_plugin third_party/grpc/compiler/src` # How to update the Java code: -Download the necessary jars at version `1.32.2` from maven central. +Download the necessary jars at version `1.33.1` from maven central. # Submitting the change needs 3 pull requests 1. Update third_party/grpc to include files from new version -2. Switch WORKSPACE, scripts/bootstrap/compile.sh and any other references to new version +2. Switch distdir_deps.bzl, scripts/bootstrap/compile.sh and any other references to new version 3. Remove older version from third_party/grpc diff --git a/third_party/grpc/bazel_1.32.0.patch b/third_party/grpc/bazel_1.33.1.patch similarity index 100% rename from third_party/grpc/bazel_1.32.0.patch rename to third_party/grpc/bazel_1.33.1.patch diff --git a/third_party/grpc/compiler/src/java_plugin/cpp/java_generator.h b/third_party/grpc/compiler/src/java_plugin/cpp/java_generator.h index 2ecc884efd4506..b499c494433922 100644 --- a/third_party/grpc/compiler/src/java_plugin/cpp/java_generator.h +++ b/third_party/grpc/compiler/src/java_plugin/cpp/java_generator.h @@ -38,13 +38,13 @@ class LogHelper { } }; -// Abort the program after logging the mesage if the given condition is not +// Abort the program after logging the message if the given condition is not // true. Otherwise, do nothing. #define GRPC_CODEGEN_CHECK(x) !(x) && LogHelper(&std::cerr).get_os() \ << "CHECK FAILED: " << __FILE__ << ":" \ << __LINE__ << ": " -// Abort the program after logging the mesage. +// Abort the program after logging the message. #define GRPC_CODEGEN_FAIL GRPC_CODEGEN_CHECK(false) namespace java_grpc_generator { diff --git a/third_party/grpc/grpc-api-1.32.2.jar b/third_party/grpc/grpc-api-1.33.1.jar similarity index 78% rename from third_party/grpc/grpc-api-1.32.2.jar rename to third_party/grpc/grpc-api-1.33.1.jar index 26b0ae4222e4b8..11fd14a3bd38f8 100644 Binary files a/third_party/grpc/grpc-api-1.32.2.jar and b/third_party/grpc/grpc-api-1.33.1.jar differ diff --git a/third_party/grpc/grpc-auth-1.32.2.jar b/third_party/grpc/grpc-auth-1.33.1.jar similarity index 89% rename from third_party/grpc/grpc-auth-1.32.2.jar rename to third_party/grpc/grpc-auth-1.33.1.jar index 9470c72a2aa916..49028a32e61d06 100644 Binary files a/third_party/grpc/grpc-auth-1.32.2.jar and b/third_party/grpc/grpc-auth-1.33.1.jar differ diff --git a/third_party/grpc/grpc-context-1.32.2.jar b/third_party/grpc/grpc-context-1.33.1.jar similarity index 76% rename from third_party/grpc/grpc-context-1.32.2.jar rename to third_party/grpc/grpc-context-1.33.1.jar index 91e94b65de02c1..519faef9720797 100644 Binary files a/third_party/grpc/grpc-context-1.32.2.jar and b/third_party/grpc/grpc-context-1.33.1.jar differ diff --git a/third_party/grpc/grpc-core-1.32.2.jar b/third_party/grpc/grpc-core-1.33.1.jar similarity index 61% rename from third_party/grpc/grpc-core-1.32.2.jar rename to third_party/grpc/grpc-core-1.33.1.jar index 60ec9075d491be..84f80cdf67c973 100644 Binary files a/third_party/grpc/grpc-core-1.32.2.jar and b/third_party/grpc/grpc-core-1.33.1.jar differ diff --git a/third_party/grpc/grpc-netty-1.32.2.jar b/third_party/grpc/grpc-netty-1.33.1.jar similarity index 71% rename from third_party/grpc/grpc-netty-1.32.2.jar rename to third_party/grpc/grpc-netty-1.33.1.jar index a08935fdf059a2..d87bd8c09231bf 100644 Binary files a/third_party/grpc/grpc-netty-1.32.2.jar and b/third_party/grpc/grpc-netty-1.33.1.jar differ diff --git a/third_party/grpc/grpc-protobuf-1.32.2.jar b/third_party/grpc/grpc-protobuf-1.33.1.jar similarity index 72% rename from third_party/grpc/grpc-protobuf-1.32.2.jar rename to third_party/grpc/grpc-protobuf-1.33.1.jar index 5f8e87f0fd64d4..1c7709f47277a1 100644 Binary files a/third_party/grpc/grpc-protobuf-1.32.2.jar and b/third_party/grpc/grpc-protobuf-1.33.1.jar differ diff --git a/third_party/grpc/grpc-protobuf-lite-1.32.2.jar b/third_party/grpc/grpc-protobuf-lite-1.33.1.jar similarity index 81% rename from third_party/grpc/grpc-protobuf-lite-1.32.2.jar rename to third_party/grpc/grpc-protobuf-lite-1.33.1.jar index 1ec35874d92e1c..5bd48dfa56b7f6 100644 Binary files a/third_party/grpc/grpc-protobuf-lite-1.32.2.jar and b/third_party/grpc/grpc-protobuf-lite-1.33.1.jar differ diff --git a/third_party/grpc/grpc-stub-1.32.2.jar b/third_party/grpc/grpc-stub-1.33.1.jar similarity index 69% rename from third_party/grpc/grpc-stub-1.32.2.jar rename to third_party/grpc/grpc-stub-1.33.1.jar index 1b0b6a9b53292a..c1bce10ecdb647 100644 Binary files a/third_party/grpc/grpc-stub-1.32.2.jar and b/third_party/grpc/grpc-stub-1.33.1.jar differ diff --git a/third_party/grpc/grpc_1.32.0.patch b/third_party/grpc/grpc_1.33.1.patch similarity index 100% rename from third_party/grpc/grpc_1.32.0.patch rename to third_party/grpc/grpc_1.33.1.patch