Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
47c2f16
chore: set up branch
scotthart Feb 5, 2025
9e7501e
update triggers branch
scotthart Feb 5, 2025
108050b
chore(deps): update protobuf to v30 (#14978)
scotthart Feb 6, 2025
8c05f0a
chore(deps): update grpc to v1.70.1 (#14979)
scotthart Feb 6, 2025
24b52d9
chore: additional updates to prepare for v3.0.0 (#14999)
scotthart Mar 5, 2025
2e9928f
chore(ci): update api and abi for v3 (#15041)
scotthart Mar 19, 2025
2ca5e98
chore(bazel): get bazel 8 working (#15042)
scotthart Apr 11, 2025
82e16e4
chore: update abi dumps
scotthart Apr 25, 2025
6a50287
add file deleted during rebase merge
scotthart Apr 25, 2025
31f4e24
Merge branch 'v3_rebase_20250425' into prepare-for-v3.0.0
scotthart Apr 25, 2025
c1f54cb
Merge remote-tracking branch 'upstream' into prepare-for-v3.0.0
scotthart Apr 25, 2025
32a09cb
chore: set up branch
scotthart Feb 5, 2025
e4e61cd
update triggers branch
scotthart Feb 5, 2025
cdf860f
chore(deps): update protobuf to v30 (#14978)
scotthart Feb 6, 2025
f0d35f4
chore(deps): update grpc to v1.70.1 (#14979)
scotthart Feb 6, 2025
9140da5
chore: additional updates to prepare for v3.0.0 (#14999)
scotthart Mar 5, 2025
f1439e4
chore(ci): update api and abi for v3 (#15041)
scotthart Mar 19, 2025
a34b875
chore(bazel): get bazel 8 working (#15042)
scotthart Apr 11, 2025
1304b4a
add file deleted during rebase merge
scotthart Apr 25, 2025
f596f42
chore: update abi-dumps after 20250527 rebase
scotthart May 27, 2025
96f9672
Merge remote-tracking branch 'upstream/prepare-for-v3.0.0' into HEAD
scotthart May 30, 2025
d114d3a
chore: set up branch
scotthart Feb 5, 2025
576482e
update triggers branch
scotthart Feb 5, 2025
2885334
chore(deps): update protobuf to v30 (#14978)
scotthart Feb 6, 2025
e391854
chore(deps): update grpc to v1.70.1 (#14979)
scotthart Feb 6, 2025
d4f0afb
chore: additional updates to prepare for v3.0.0 (#14999)
scotthart Mar 5, 2025
8db905f
chore(ci): update api and abi for v3 (#15041)
scotthart Mar 19, 2025
f83adcd
chore(bazel): get bazel 8 working (#15042)
scotthart Apr 11, 2025
498c58b
add file deleted during rebase merge
scotthart Apr 25, 2025
1d1ac75
chore: update abi-dumps after 20250527 rebase
scotthart May 27, 2025
14dd653
chore: update protobuf to v31.1 (#15188)
scotthart Jun 4, 2025
e07ae75
Merge remote-tracking branch 'upstream/prepare-for-v3.0.0' into HEAD
scotthart Jun 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 6 additions & 7 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@
# Use host-OS-specific config lines from bazelrc files.
build --enable_platform_specific_config=true

# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which
# disables C++14 features, even if the compilers defaults to C++ >= 14
build:linux --cxxopt=-std=c++14
build:macos --cxxopt=-std=c++14
# Protobuf and gRPC require (or soon will require) C++14 to compile the "host"
# The project requires C++ >= 17.
build:linux --cxxopt=-std=c++17
build:macos --cxxopt=-std=c++17
# Protobuf and gRPC require C++17 to compile the "host"
# targets, such as protoc and the grpc plugin.
build:linux --host_cxxopt=-std=c++14
build:macos --host_cxxopt=-std=c++14
build:linux --host_cxxopt=-std=c++17
build:macos --host_cxxopt=-std=c++17

# Do not create the convenience links. They are inconvenient when the build
# runs inside a docker image or if one builds a quickstart and then builds
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.6.1
8.1.1
1 change: 1 addition & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ Checks: >
performance-*,
portability-*,
readability-*,
-bugprone-exception-escape,
-google-readability-braces-around-statements,
-google-readability-namespace-comments,
-google-runtime-references,
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
# limitations under the License.
# ~~~

cmake_minimum_required(VERSION 3.13...3.24)
cmake_minimum_required(VERSION 3.16...3.31)

# Define the project name and where to report bugs.
set(PACKAGE_BUGREPORT "https://github.com/googleapis/google-cloud-cpp/issues")

project(
google-cloud-cpp
VERSION 2.38.0
VERSION 3.0.0
LANGUAGES CXX)
set(PROJECT_VERSION_PRE_RELEASE "rc")

Expand Down
12 changes: 6 additions & 6 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,16 @@

module(
name = "google_cloud_cpp",
version = "2.38.0-rc", # Updated by CMake
compatibility_level = 2, # Updated by CMake
version = "3.0.0-rc", # Updated by CMake
compatibility_level = 3, # Updated by CMake
)

bazel_dep(name = "platforms", version = "0.0.11")
bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_cc", version = "0.0.17")
bazel_dep(name = "abseil-cpp", version = "20240722.1", repo_name = "com_google_absl")
bazel_dep(name = "protobuf", version = "29.4", repo_name = "com_google_protobuf")
bazel_dep(name = "rules_cc", version = "0.1.1")
bazel_dep(name = "abseil-cpp", version = "20250127.1", repo_name = "abseil-cpp")
bazel_dep(name = "protobuf", version = "31.1", repo_name = "com_google_protobuf")
bazel_dep(name = "boringssl", version = "0.0.0-20230215-5c22014")
bazel_dep(name = "grpc", version = "1.69.0", repo_name = "com_github_grpc_grpc")
bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "com_github_nlohmann_json")
bazel_dep(name = "curl", version = "8.8.0.bcr.3", repo_name = "com_github_curl_curl")
bazel_dep(name = "crc32c", version = "1.1.0", repo_name = "com_github_google_crc32c")
Expand All @@ -52,6 +51,7 @@ python.toolchain(
python_version = "3.11",
)

bazel_dep(name = "grpc", version = "1.71.0", repo_name = "com_github_grpc_grpc")
bazel_dep(name = "googleapis", version = "0.0.0", repo_name = "com_google_googleapis")
archive_override(
module_name = "googleapis",
Expand Down
10 changes: 5 additions & 5 deletions bazel/gapic.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,23 @@ def cc_gapic_library(name, service_dirs = [], googleapis_deps = [], additional_d

native.filegroup(
name = "srcs",
srcs = native.glob(sources_glob),
srcs = native.glob(sources_glob, allow_empty = True),
)

native.filegroup(
name = "hdrs",
srcs = native.glob(include = code_glob, exclude = sources_glob),
srcs = native.glob(include = code_glob, exclude = sources_glob, allow_empty = True),
)

native.filegroup(
name = "public_hdrs",
srcs = native.glob([d + "*.h" for d in service_dirs]),
srcs = native.glob([d + "*.h" for d in service_dirs], allow_empty = True),
visibility = ["//:__pkg__"],
)

native.filegroup(
name = "mocks",
srcs = native.glob([d + "mocks/*.h" for d in service_dirs]),
srcs = native.glob([d + "mocks/*.h" for d in service_dirs], allow_empty = True),
visibility = ["//:__pkg__"],
)

Expand Down Expand Up @@ -84,4 +84,4 @@ def cc_gapic_library(name, service_dirs = [], googleapis_deps = [], additional_d
"//:" + name,
"//google/cloud/testing_util:google_cloud_cpp_testing_private",
],
) for sample in native.glob([d + "samples/*_samples.cc" for d in service_dirs])]
) for sample in native.glob([d + "samples/*_samples.cc" for d in service_dirs], allow_empty = True)]
13 changes: 13 additions & 0 deletions bazel/googleapis.workspace.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/BUILD.bazel b/BUILD.bazel
index 95e4c12e5..83838d3f0 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -2,7 +2,7 @@ genrule(
name = "build_gen",
outs = ["build_gen.sh"],
executable = True,
- srcs = glob(["run_build_gen.sh"]),
+ srcs = glob(["run_build_gen.sh"], allow_empty=True),
cmd = """
if test -z \"$(SRCS)\"; then
cat <<EOD > $@
34 changes: 23 additions & 11 deletions bazel/workspace0.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,19 @@ def gl_cpp_workspace0(name = None):
http_archive,
name = "rules_cc",
urls = [
"https://github.com/bazelbuild/rules_cc/releases/download/0.0.17/rules_cc-0.0.17.tar.gz",
"https://github.com/bazelbuild/rules_cc/releases/download/0.1.1/rules_cc-0.1.1.tar.gz",
],
sha256 = "abc605dd850f813bb37004b77db20106a19311a96b2da1c92b789da529d28fe1",
strip_prefix = "rules_cc-0.0.17",
sha256 = "712d77868b3152dd618c4d64faaddefcc5965f90f5de6e6dd1d5ddcd0be82d42",
strip_prefix = "rules_cc-0.1.1",
)

maybe(
http_archive,
name = "com_envoyproxy_protoc_gen_validate",
urls = [
"https://github.com/bufbuild/protoc-gen-validate/archive/v1.2.1.tar.gz",
],
strip_prefix = "protoc-gen-validate-1.2.1",
)

# protobuf requires this
Expand All @@ -101,7 +110,7 @@ def gl_cpp_workspace0(name = None):
# Load Abseil
maybe(
http_archive,
name = "com_google_absl",
name = "abseil-cpp",
urls = [
"https://github.com/abseil/abseil-cpp/archive/20250127.1.tar.gz",
],
Expand Down Expand Up @@ -137,7 +146,7 @@ def gl_cpp_workspace0(name = None):
# protobuf message. No changes to `patches` should ever be
# committed to the main branch.
patch_tool = "patch",
patch_args = ["-p1"],
patch_args = ["-p1", "-l", "-n"],
patches = [],
)

Expand All @@ -146,10 +155,10 @@ def gl_cpp_workspace0(name = None):
http_archive,
name = "com_google_protobuf",
urls = [
"https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v31.1.tar.gz",
],
sha256 = "6bd9dcc91b17ef25c26adf86db71c67ec02431dc92e9589eaf82e22889230496",
strip_prefix = "protobuf-29.4",
sha256 = "c3a0a9ece8932e31c3b736e2db18b1c42e7070cd9b881388b26d01aa71e24ca2",
strip_prefix = "protobuf-31.1",
)

# Load BoringSSL. This could be automatically loaded by gRPC. But as of
Expand All @@ -172,10 +181,13 @@ def gl_cpp_workspace0(name = None):
http_archive,
name = "com_github_grpc_grpc",
urls = [
"https://github.com/grpc/grpc/archive/v1.69.0.tar.gz",
"https://github.com/grpc/grpc/archive/v1.71.0.tar.gz",
],
sha256 = "cd256d91781911d46a57506978b3979bfee45d5086a1b6668a3ae19c5e77f8dc",
strip_prefix = "grpc-1.69.0",
repo_mapping = {
"@com_google_absl": "@abseil-cpp",
},
sha256 = "0d631419e54ec5b29def798623ee3bf5520dac77abeab3284ef7027ec2363f91",
strip_prefix = "grpc-1.71.0",
)

# We use the cc_proto_library() rule from @com_google_protobuf, which
Expand Down
Loading
Loading