Skip to content

Commit 4147191

Browse files
authored
Merge branch 'prepare-for-v3.0.0' into mark_oauth2_deprecated
2 parents 406f3c4 + f4d0867 commit 4147191

6,834 files changed

Lines changed: 154341 additions & 103336 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.bazelrc

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,21 @@
1818
# Use host-OS-specific config lines from bazelrc files.
1919
build --enable_platform_specific_config=true
2020

21-
# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which
22-
# disables C++14 features, even if the compilers defaults to C++ >= 14
23-
build:linux --cxxopt=-std=c++14
24-
build:macos --cxxopt=-std=c++14
25-
# Protobuf and gRPC require (or soon will require) C++14 to compile the "host"
21+
build --features=external_include_paths
22+
23+
build --per_file_copt=grpc+//@-Wno-private-header
24+
build --copt=-Wno-private-header
25+
build --cxxopt=-Wno-private-header
26+
build --host_copt=-Wno-private-header
27+
build --host_cxxopt=-Wno-private-header
28+
29+
# The project requires C++ >= 17.
30+
build:linux --cxxopt=-std=c++17
31+
build:macos --cxxopt=-std=c++17
32+
# Protobuf and gRPC require C++17 to compile the "host"
2633
# targets, such as protoc and the grpc plugin.
27-
build:linux --host_cxxopt=-std=c++14
28-
build:macos --host_cxxopt=-std=c++14
34+
build:linux --host_cxxopt=-std=c++17
35+
build:macos --host_cxxopt=-std=c++17
2936

3037
# Do not create the convenience links. They are inconvenient when the build
3138
# runs inside a docker image or if one builds a quickstart and then builds
@@ -73,6 +80,8 @@ build:sanitizer --strip=never
7380
build:sanitizer --copt=-Og
7481
build:sanitizer --copt=-g
7582
build:sanitizer --copt=-fno-omit-frame-pointer
83+
#build:sanitizer --features=external_include_paths
84+
7685

7786
# --config asan: Address Sanitizer
7887
build:asan --config=sanitizer
@@ -105,6 +114,8 @@ build:ubsan --copt=-DCURL_STRICTER
105114
build:ubsan --linkopt=-fsanitize=undefined
106115
build:ubsan --linkopt=-fsanitize-link-c++-runtime
107116
build:ubsan --action_env=UBSAN_OPTIONS=halt_on_error=1:print_stacktrace=1
117+
#build:ubsan --features=external_include_paths
118+
108119

109120
# --config xsan: Runs misc. sanitizers that aren't covered elsewhere.
110121
build:xsan --config=sanitizer

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.6.1
1+
8.1.1

.clang-tidy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ Checks: >
8585
performance-*,
8686
portability-*,
8787
readability-*,
88+
-bugprone-exception-escape,
8889
-google-readability-braces-around-statements,
8990
-google-readability-namespace-comments,
9091
-google-runtime-references,

.github/renovate.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"python": {
88
"enabled": false
99
},
10+
"baseBranches": ["main", "prepare-for-v3.0.0"],
1011
"regexManagers": [
1112
{
1213
"fileMatch": [

.github/workflows/windows-bazel.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ jobs:
8888
- name: Pre Build Disk Space
8989
shell: bash
9090
run: df -m
91+
- name: Check installed curl version
92+
shell: bash
93+
run: curl --version
9194
- name: Build google-cloud-cpp
9295
shell: bash
9396
run: |

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ breaking changes in the upcoming 3.x release. This release is scheduled for
1111
We are happy to announce the following GA libraries. Unless specifically noted,
1212
the APIs in these libraries are stable, and are ready for production use.
1313

14+
- [Dataform API](/google/cloud/dataform/README.md)
15+
- [Google Cloud Managed Lustre API](/google/cloud/lustre/README.md)
1416
- [Memorystore API](/google/cloud/memorystore/README.md)
1517
- [Oracle Database@Google Cloud API](/google/cloud/oracledatabase/README.md)
1618

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
# limitations under the License.
1515
# ~~~
1616

17-
cmake_minimum_required(VERSION 3.13...3.24)
17+
cmake_minimum_required(VERSION 3.16...3.31)
1818

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

2222
project(
2323
google-cloud-cpp
24-
VERSION 2.38.0
24+
VERSION 3.0.0
2525
LANGUAGES CXX)
2626
set(PROJECT_VERSION_PRE_RELEASE "rc")
2727

MODULE.bazel

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,16 @@
1616

1717
module(
1818
name = "google_cloud_cpp",
19-
version = "2.38.0-rc", # Updated by CMake
20-
compatibility_level = 2, # Updated by CMake
19+
version = "3.0.0-rc", # Updated by CMake
20+
compatibility_level = 3, # Updated by CMake
2121
)
2222

2323
bazel_dep(name = "platforms", version = "0.0.11")
2424
bazel_dep(name = "bazel_skylib", version = "1.7.1")
25-
bazel_dep(name = "rules_cc", version = "0.0.17")
26-
bazel_dep(name = "abseil-cpp", version = "20240722.1", repo_name = "com_google_absl")
27-
bazel_dep(name = "protobuf", version = "29.4", repo_name = "com_google_protobuf")
25+
bazel_dep(name = "rules_cc", version = "0.1.1")
26+
bazel_dep(name = "abseil-cpp", version = "20250127.1", repo_name = "abseil-cpp")
27+
bazel_dep(name = "protobuf", version = "31.1", repo_name = "com_google_protobuf")
2828
bazel_dep(name = "boringssl", version = "0.0.0-20230215-5c22014")
29-
bazel_dep(name = "grpc", version = "1.69.0", repo_name = "com_github_grpc_grpc")
3029
bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "com_github_nlohmann_json")
3130
bazel_dep(name = "curl", version = "8.8.0.bcr.3", repo_name = "com_github_curl_curl")
3231
bazel_dep(name = "crc32c", version = "1.1.0", repo_name = "com_github_google_crc32c")
@@ -40,27 +39,28 @@ bazel_dep(name = "yaml-cpp", version = "0.8.0", dev_dependency = True, repo_name
4039
bazel_dep(name = "pugixml", version = "1.15", dev_dependency = True, repo_name = "com_github_zeux_pugixml")
4140

4241
# Our `curl.BUILD` file uses these.
43-
bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
42+
bazel_dep(name = "zlib", version = "1.3.1.bcr.6")
4443
bazel_dep(name = "c-ares", version = "1.19.1.bcr.1", repo_name = "com_github_cares_cares")
4544

4645
# Pin this to fix a break in bazel/deps-cache.py
47-
bazel_dep(name = "protoc-gen-validate", version = "1.2.1", dev_dependency = True, repo_name = "com_envoyproxy_protoc_gen_validate")
46+
bazel_dep(name = "protoc-gen-validate", version = "1.2.1.bcr.1", dev_dependency = True, repo_name = "com_envoyproxy_protoc_gen_validate")
4847

4948
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
5049
python.toolchain(
5150
ignore_root_user_error = True,
5251
python_version = "3.11",
5352
)
5453

54+
bazel_dep(name = "grpc", version = "1.72.0", repo_name = "com_github_grpc_grpc")
5555
bazel_dep(name = "googleapis", version = "0.0.0", repo_name = "com_google_googleapis")
5656
archive_override(
5757
module_name = "googleapis",
58-
integrity = "sha256-BUa9ungV9/7bsPxRANTzg5DuZ5MEZg/njNOIxEhNhp0=",
58+
integrity = "sha256-dbNAPWReES2GP4DBbsnaAboV0eIBKO6o9loY7ujl1lA=",
5959
patch_strip = 1,
6060
patches = ["//bazel:googleapis.modules.patch"],
61-
strip_prefix = "googleapis-079e5305050859d0e3a8c0768611283ee4863c07",
61+
strip_prefix = "googleapis-ea40277431fb821fd5a9b1eb8227535846388770",
6262
urls = [
63-
"https://github.com/googleapis/googleapis/archive/079e5305050859d0e3a8c0768611283ee4863c07.tar.gz",
63+
"https://github.com/googleapis/googleapis/archive/ea40277431fb821fd5a9b1eb8227535846388770.tar.gz",
6464
],
6565
)
6666

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,9 @@ See each library's `README.md` file for more information about:
203203
- [Google Cloud Data Catalog API](google/cloud/datacatalog/README.md)
204204
[[quickstart]](google/cloud/datacatalog/quickstart/README.md)
205205
[[reference]](https://cloud.google.com/cpp/docs/reference/datacatalog/latest)
206+
- [Dataform API](google/cloud/dataform/README.md)
207+
[[quickstart]](google/cloud/dataform/quickstart/README.md)
208+
[[reference]](https://cloud.google.com/cpp/docs/reference/dataform/latest)
206209
- [Cloud Data Fusion API](google/cloud/datafusion/README.md)
207210
[[quickstart]](google/cloud/datafusion/quickstart/README.md)
208211
[[reference]](https://cloud.google.com/cpp/docs/reference/datafusion/latest)
@@ -299,6 +302,9 @@ See each library's `README.md` file for more information about:
299302
- [Google Cloud Logging](google/cloud/logging/README.md)
300303
[[quickstart]](google/cloud/logging/quickstart/README.md)
301304
[[reference]](https://cloud.google.com/cpp/docs/reference/logging/latest)
305+
- [Google Cloud Managed Lustre API](google/cloud/lustre/README.md)
306+
[[quickstart]](google/cloud/lustre/quickstart/README.md)
307+
[[reference]](https://cloud.google.com/cpp/docs/reference/lustre/latest)
302308
- [Managed Service for Microsoft Active Directory API](google/cloud/managedidentities/README.md)
303309
[[quickstart]](google/cloud/managedidentities/quickstart/README.md)
304310
[[reference]](https://cloud.google.com/cpp/docs/reference/managedidentities/latest)

bazel/gapic.bzl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,23 @@ def cc_gapic_library(name, service_dirs = [], googleapis_deps = [], additional_d
3838

3939
native.filegroup(
4040
name = "srcs",
41-
srcs = native.glob(sources_glob),
41+
srcs = native.glob(sources_glob, allow_empty = True),
4242
)
4343

4444
native.filegroup(
4545
name = "hdrs",
46-
srcs = native.glob(include = code_glob, exclude = sources_glob),
46+
srcs = native.glob(include = code_glob, exclude = sources_glob, allow_empty = True),
4747
)
4848

4949
native.filegroup(
5050
name = "public_hdrs",
51-
srcs = native.glob([d + "*.h" for d in service_dirs]),
51+
srcs = native.glob([d + "*.h" for d in service_dirs], allow_empty = True),
5252
visibility = ["//:__pkg__"],
5353
)
5454

5555
native.filegroup(
5656
name = "mocks",
57-
srcs = native.glob([d + "mocks/*.h" for d in service_dirs]),
57+
srcs = native.glob([d + "mocks/*.h" for d in service_dirs], allow_empty = True),
5858
visibility = ["//:__pkg__"],
5959
)
6060

@@ -84,4 +84,4 @@ def cc_gapic_library(name, service_dirs = [], googleapis_deps = [], additional_d
8484
"//:" + name,
8585
"//google/cloud/testing_util:google_cloud_cpp_testing_private",
8686
],
87-
) for sample in native.glob([d + "samples/*_samples.cc" for d in service_dirs])]
87+
) for sample in native.glob([d + "samples/*_samples.cc" for d in service_dirs], allow_empty = True)]

0 commit comments

Comments
 (0)