Refs/heads/revert 15869 remove client

.bazelrc

@@ -18,14 +18,21 @@
 # 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"
+build --features=external_include_paths
+
+build --per_file_copt=grpc+//@-Wno-private-header
+build --copt=-Wno-private-header
+build --cxxopt=-Wno-private-header
+build --host_copt=-Wno-private-header
+build --host_cxxopt=-Wno-private-header
+
+# 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
@@ -47,9 +54,6 @@ build --experimental_ui_max_stdouterr_bytes=-1
 # in a random order to help expose undesirable interdependencies.
 test --test_env=GTEST_SHUFFLE --test_env=GTEST_RANDOM_SEED
 
-# By default, build the library with OpenTelemetry
-build --//:enable_opentelemetry
-
 # Don't show warnings when building external dependencies. This still shows
 # warnings when using these dependencies (say in headers).
 build --output_filter='^//((?!(external):).)*$'
@@ -70,6 +74,8 @@ build:sanitizer --strip=never
 build:sanitizer --copt=-Og
 build:sanitizer --copt=-g
 build:sanitizer --copt=-fno-omit-frame-pointer
+#build:sanitizer --features=external_include_paths
+
 
 # --config asan: Address Sanitizer
 build:asan --config=sanitizer
@@ -102,6 +108,8 @@ build:ubsan --copt=-DCURL_STRICTER
 build:ubsan --linkopt=-fsanitize=undefined
 build:ubsan --linkopt=-fsanitize-link-c++-runtime
 build:ubsan --action_env=UBSAN_OPTIONS=halt_on_error=1:print_stacktrace=1
+#build:ubsan --features=external_include_paths
+
 
 # --config xsan: Runs misc. sanitizers that aren't covered elsewhere.
 build:xsan --config=sanitizer

.bazelversion

@@ -1 +1 @@
-7.6.1
+8.4.2

.clang-tidy

@@ -85,6 +85,7 @@ Checks: >
   performance-*,
   portability-*,
   readability-*,
+  -bugprone-exception-escape,
   -google-readability-braces-around-statements,
   -google-readability-namespace-comments,
   -google-runtime-references,

.github/workflows/macos-cmake.yml

@@ -70,7 +70,7 @@ jobs:
     - uses: actions/setup-python@v5
       id: py311
       with:
-        python-version: '3.11'
+        python-version: '3.13'
     - uses: google-github-actions/setup-gcloud@v2
       env:
         CLOUDSDK_PYTHON: ${{ steps.py311.outputs.python-path }}
@@ -84,8 +84,6 @@ jobs:
           spanner
         )
         core2_features=(
-          pubsub
-          pubsublite
           storage
           storage_grpc
         )

.github/workflows/windows-cmake.yml

@@ -76,7 +76,7 @@ jobs:
     - uses: actions/setup-python@v5
       id: py311
       with:
-        python-version: '3.11'
+        python-version: '3.13'
     - uses: google-github-actions/setup-gcloud@v2
       env:
         CLOUDSDK_PYTHON: ${{ steps.py311.outputs.python-path }}

BUILD.bazel

@@ -254,8 +254,3 @@ cc_library(
         "//google/cloud:google_cloud_cpp_universe_domain",
     ],
 )
-
-bool_flag(
-    name = "enable_opentelemetry",
-    build_setting_default = False,
-)

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+**NOTE**: Please refer to the [V3 Migration Guide](/doc/v3-migration-guide.md) 
+for details on updating existing applications using v1.x.y or v2.x.y.
+
 **NOTE**: [Future Breaking Changes](/doc/deprecated.md) lists anticipated
 breaking changes in the upcoming 3.x release. This release is scheduled for
 2024-12 or 2025-01.

CMakeLists.txt

@@ -14,16 +14,16 @@
 # 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.46.0
+    VERSION 3.0.0
     LANGUAGES CXX)
-set(PROJECT_VERSION_PRE_RELEASE "rc")
+set(PROJECT_VERSION_PRE_RELEASE "rc1")
 
 if (NOT "${PROJECT_VERSION_PRE_RELEASE}" STREQUAL "")
     set(PROJECT_VERSION "${PROJECT_VERSION}-${PROJECT_VERSION_PRE_RELEASE}")

MODULE.bazel

@@ -16,57 +16,48 @@
 
 module(
     name = "google_cloud_cpp",
-    version = "2.46.0-rc",  # Updated by CMake
-    compatibility_level = 2,  # Updated by CMake
+    version = "3.0.0-rc1",  # Updated by CMake
+    compatibility_level = 3,  # Updated by CMake
 )
 
 bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "bazel_skylib", version = "1.8.2")
-bazel_dep(name = "rules_cc", version = "0.1.4")
-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 = "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")
-bazel_dep(name = "opentelemetry-cpp", version = "1.19.0", repo_name = "io_opentelemetry_cpp")
+bazel_dep(name = "rules_cc", version = "0.2.14")
+bazel_dep(name = "abseil-cpp", version = "20250814.1")
+
+# For backwards compatibility with WORKSPACE.
+# The name "com_google_protobuf" is internally used by @bazel_tools,
+# a native repository we cannot override.
+# See https://github.com/googleapis/google-cloud-cpp/issues/15393
+bazel_dep(name = "protobuf", version = "33.1", repo_name = "com_google_protobuf")
+bazel_dep(name = "boringssl", version = "0.20241024.0")
+bazel_dep(name = "nlohmann_json", version = "3.11.3")
+bazel_dep(name = "curl", version = "8.8.0.bcr.3")
+bazel_dep(name = "crc32c", version = "1.1.0")
+bazel_dep(name = "opentelemetry-cpp", version = "1.22.0")
 bazel_dep(name = "rules_proto", version = "7.1.0")
 bazel_dep(name = "rules_python", version = "1.6.3")
+bazel_dep(name = "rules_apple", version = "4.3.2")
+bazel_dep(name = "googletest", version = "1.17.0")
 
-bazel_dep(name = "googletest", version = "1.15.2", dev_dependency = True, repo_name = "com_google_googletest")
-bazel_dep(name = "google_benchmark", version = "1.9.2", dev_dependency = True, repo_name = "com_google_benchmark")
+bazel_dep(name = "google_benchmark", version = "1.9.4", dev_dependency = True, repo_name = "com_google_benchmark")
 bazel_dep(name = "yaml-cpp", version = "0.8.0", dev_dependency = True, repo_name = "com_github_jbeder_yaml_cpp")
 bazel_dep(name = "pugixml", version = "1.15", dev_dependency = True, repo_name = "com_github_zeux_pugixml")
 
 # Our `curl.BUILD` file uses these.
 bazel_dep(name = "zlib", version = "1.3.1.bcr.7")
-bazel_dep(name = "c-ares", version = "1.19.1.bcr.1", repo_name = "com_github_cares_cares")
+bazel_dep(name = "c-ares", version = "1.34.5.bcr.2", repo_name = "com_github_cares_cares")
 
 # Pin this to fix a break in bazel/deps-cache.py
-bazel_dep(name = "protoc-gen-validate", version = "1.2.1.bcr.1", dev_dependency = True, repo_name = "com_envoyproxy_protoc_gen_validate")
+bazel_dep(name = "protoc-gen-validate", version = "1.2.1.bcr.2", dev_dependency = True, repo_name = "com_envoyproxy_protoc_gen_validate")
 
 python = use_extension("@rules_python//python/extensions:python.bzl", "python")
 python.toolchain(
     ignore_root_user_error = True,
     python_version = "3.11",
 )
 
-bazel_dep(name = "googleapis", version = "0.0.0", repo_name = "com_google_googleapis")
-archive_override(
-    module_name = "googleapis",
-    integrity = "sha256-p8PXzb1U5D3cfETzVxpx4ATLpRnCBdoui5N0gNYIroY=",
-    patch_strip = 1,
-    patches = ["//bazel:googleapis.modules.patch"],
-    strip_prefix = "googleapis-05f65958eb7f2a8bc59db87ad40487f0fb093097",
-    urls = [
-        "https://github.com/googleapis/googleapis/archive/05f65958eb7f2a8bc59db87ad40487f0fb093097.tar.gz",
-    ],
-)
-
-switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
-switched_rules.use_languages(
-    cc = True,
-    grpc = True,
-)
-use_repo(switched_rules, "com_google_googleapis_imports")
+bazel_dep(name = "grpc", version = "1.76.0.bcr.1")
+bazel_dep(name = "googleapis", version = "0.0.0-20251211-05f65958")
+bazel_dep(name = "googleapis-cc", version = "1.0.0")
+bazel_dep(name = "googleapis-grpc-cc", version = "1.0.0")

README.md

@@ -10,6 +10,9 @@
 This repository contains idiomatic C++ client libraries for the following
 [Google Cloud Platform](https://cloud.google.com/) services.
 
+> Please refer to the [V3 Migration Guide](/doc/v3-migration-guide.md) for
+> details on updating existing applications using v1.x.y or v2.x.y.
+
 > Please check the [CHANGELOG] for important announcements and upcoming changes.
 
 ## Quickstart

bazel/gapic.bzl

@@ -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__"],
     )
 
@@ -72,7 +72,7 @@ def cc_gapic_library(name, service_dirs = [], googleapis_deps = [], additional_d
         visibility = ["//:__pkg__"],
         deps = [
             ":google_cloud_cpp_" + name,
-            "@com_google_googletest//:gtest",
+            "@googletest//:gtest",
         ],
     )
 
@@ -85,4 +85,4 @@ def cc_gapic_library(name, service_dirs = [], googleapis_deps = [], additional_d
             "//:universe_domain",
             "//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)]