diff --git a/distdir_deps.bzl b/distdir_deps.bzl index 11dd547b7d2464..324aef52e78adb 100644 --- a/distdir_deps.bzl +++ b/distdir_deps.bzl @@ -108,11 +108,11 @@ DIST_DEPS = { ], }, "protocolbuffers": { - "archive": "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", - "sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4", + "archive": "a02d92e0257a35f11d4a58b6a932506cbdbb2f29.tar.gz", + "sha256": "1cd33bf607ebc83acf71b6078c1d4361ffa49d647a2ce792a557ae98f75500ad", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", - "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", + # "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/a02d92e0257a35f11d4a58b6a932506cbdbb2f29.tar.gz", + "https://github.com/protocolbuffers/upb/archive/a02d92e0257a35f11d4a58b6a932506cbdbb2f29.tar.gz", ], "used_in": [ "additional_distfiles", @@ -120,17 +120,17 @@ DIST_DEPS = { ], }, "com_github_grpc_grpc": { - "archive": "v1.41.0.tar.gz", - "sha256": "e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656", - "strip_prefix": "grpc-1.41.0", + "archive": "v1.45.0.tar.gz", + "sha256": "ec19657a677d49af59aa806ec299c070c882986c9fcc022b1c22c2a3caf01bcd", + "strip_prefix": "grpc-1.45.0", "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.41.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.41.0.tar.gz", + # "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.45.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.45.0.tar.gz", ], "patch_args": ["-p1"], "patches": [ - "//third_party/grpc:grpc_1.41.0.patch", - "//third_party/grpc:grpc_1.41.0.win_arm64.patch", + "//third_party/grpc:grpc_1.45.0.patch", + "//third_party/grpc:grpc_1.45.0.win_arm64.patch", ], "used_in": [ "additional_distfiles", diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index 67c72106e68797..5a4ea438e12fe1 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' | grep -Fv third_party/netty_tcnative | tr "\n" " ") -GRPC_JAVA_VERSION=1.41.0 +GRPC_JAVA_VERSION=1.45.1 GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e ".*${GRPC_JAVA_VERSION}.*jar" | tr "\n" " ") GUAVA_VERSION=30.1.1 GUAVA_JARS=$(find third_party/guava -name '*.jar' | grep -e ".*${GUAVA_VERSION}.*jar" | tr "\n" " ")