Merge Master

tanvi-jagtap · Jan 17, 2025 · 3f513cf · 3f513cf
2 parents 05e3366 + 65ae463
commit 3f513cf
Show file tree

Hide file tree

Showing 123 changed files with 1,576 additions and 8,276 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/Package.swift b/Package.swift
diff --git a/bazel/cc_grpc_library.bzl b/bazel/cc_grpc_library.bzl
@@ -13,6 +13,7 @@
 # limitations under the License.
 """Generates and compiles C++ grpc stubs from proto_library rules."""
 
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("//bazel:generate_cc.bzl", "generate_cc")
 load("//bazel:protobuf.bzl", "well_known_proto_libs")
@@ -84,8 +85,7 @@ def cc_grpc_library(
             deps = proto_deps,
             **kwargs
         )
-
-        native.cc_proto_library(
+        cc_proto_library(
             name = cc_proto_target,
             deps = [":" + proto_target],
             **kwargs

diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl
diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl
@@ -29,6 +29,7 @@ Contains macros used throughout the repo.
 
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
 load("@build_bazel_rules_apple//apple/testing/default_runner:ios_test_runner.bzl", "ios_test_runner")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
 load("@com_google_protobuf//bazel:upb_proto_library.bzl", "upb_proto_library", "upb_proto_reflection_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("//bazel:cc_grpc_library.bzl", "cc_grpc_library")
@@ -256,7 +257,7 @@ def grpc_internal_proto_library(
     )
 
 def grpc_cc_proto_library(name, deps = [], visibility = None):
-    native.cc_proto_library(name = name, deps = deps, visibility = visibility)
+    cc_proto_library(name = name, deps = deps, visibility = visibility)
 
 # DO NOT USE -- callers should instead be changed to use separate
 # grpc_internal_proto_library(), grpc_cc_proto_library(), and

diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
@@ -180,11 +180,11 @@ def grpc_deps():
     if "bazel_compdb" not in native.existing_rules():
         http_archive(
             name = "bazel_compdb",
-            sha256 = "bcecfd622c4ef272fd4ba42726a52e140b961c4eac23025f18b346c968a8cfb4",
-            strip_prefix = "bazel-compilation-database-0.4.5",
+            sha256 = "79502264d1a3a4b6309d4dae8c822e7349bcfe33e84f3c6d1affb2a40d11a31d",
+            strip_prefix = "bazel-compilation-database-d198303a4319092ab31895c4b98d64174ebe8872",
             urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/grailbio/bazel-compilation-database/archive/0.4.5.tar.gz",
-                "https://github.com/grailbio/bazel-compilation-database/archive/0.4.5.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/grailbio/bazel-compilation-database/archive/d198303a4319092ab31895c4b98d64174ebe8872.tar.gz",
+                "https://github.com/grailbio/bazel-compilation-database/archive/d198303a4319092ab31895c4b98d64174ebe8872.tar.gz",
             ],
         )