Skip to content

Commit 0d76790

Browse files
authored
chore: additional updates to prepare for v3.0.0 (googleapis#14999)
1 parent 1b4eebe commit 0d76790

Some content is hidden

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

60 files changed

+282
-137
lines changed

.bazelrc

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@
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+
# The project requires C++ >= 17.
22+
build:linux --cxxopt=-std=c++17
23+
build:macos --cxxopt=-std=c++17
24+
# Protobuf and gRPC require C++17 to compile the "host"
2625
# targets, such as protoc and the grpc plugin.
27-
build:linux --host_cxxopt=-std=c++14
28-
build:macos --host_cxxopt=-std=c++14
26+
build:linux --host_cxxopt=-std=c++17
27+
build:macos --host_cxxopt=-std=c++17
2928

3029
# Do not create the convenience links. They are inconvenient when the build
3130
# runs inside a docker image or if one builds a quickstart and then builds

.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,

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ bazel_dep(name = "zlib", version = "1.3.1.bcr.4")
4444
bazel_dep(name = "c-ares", version = "1.19.1", repo_name = "com_github_cares_cares")
4545

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

4949
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
5050
python.toolchain(

bazel/workspace0.bzl

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,15 @@ def gl_cpp_workspace0(name = None):
7777
strip_prefix = "rules_cc-0.0.17",
7878
)
7979

80+
maybe(
81+
http_archive,
82+
name = "com_envoyproxy_protoc_gen_validate",
83+
urls = [
84+
"https://github.com/bufbuild/protoc-gen-validate/archive/v1.2.1.tar.gz",
85+
],
86+
strip_prefix = "protoc-gen-validate-1.2.1",
87+
)
88+
8089
# protobuf requires this
8190
maybe(
8291
http_archive,
@@ -172,10 +181,10 @@ def gl_cpp_workspace0(name = None):
172181
http_archive,
173182
name = "com_github_grpc_grpc",
174183
urls = [
175-
"https://github.com/grpc/grpc/archive/v1.70.1.tar.gz",
184+
"https://github.com/grpc/grpc/archive/v1.71.0-pre2.tar.gz",
176185
],
177-
sha256 = "c4e85806a3a23fd2a78a9f8505771ff60b2beef38305167d50f5e8151728e426",
178-
strip_prefix = "grpc-1.70.1",
186+
sha256 = "666b792b329fec8f4490ad2b5423345523d597add25ee57c1bfdb53fa0d34f8a",
187+
strip_prefix = "grpc-1.71.0-pre2",
179188
)
180189

181190
# We use the cc_proto_library() rule from @com_google_protobuf, which

ci/cloudbuild/builds/check-api.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ fi
4545
# https://github.com/googleapis/google-cloud-cpp/issues/6313
4646
io::run cmake "${cmake_args[@]}" \
4747
-DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
48+
-DCMAKE_CXX_STANDARD=17 \
4849
-DCMAKE_INSTALL_MESSAGE=NEVER \
4950
-DBUILD_SHARED_LIBS=ON \
5051
-DCMAKE_BUILD_TYPE=Debug \

ci/cloudbuild/builds/clang-7.0.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ ENABLED_FEATURES="${ENABLED_FEATURES},compute"
3232
readonly ENABLED_FEATURES
3333

3434
io::run cmake -GNinja -S . -B cmake-out \
35+
-DCMAKE_CXX_STANDARD=17 \
3536
-DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" \
3637
-DGOOGLE_CLOUD_CPP_ENABLE_CCACHE=ON \
3738
-DGOOGLE_CLOUD_CPP_ENABLE_WERROR=ON \

ci/cloudbuild/builds/clang-tidy-compute.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ readonly ENABLED_FEATURES="compute"
3535
io::run cmake "${cmake_args[@]}" \
3636
-DCMAKE_CXX_CLANG_TIDY=/usr/local/bin/clang-tidy-wrapper \
3737
-DGOOGLE_CLOUD_CPP_ENABLE_CLANG_ABI_COMPAT_17=ON \
38-
-DCMAKE_CXX_STANDARD=14 \
38+
-DCMAKE_CXX_STANDARD=17 \
3939
-DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" \
4040
-DGOOGLE_CLOUD_CPP_INTERNAL_DOCFX=ON
4141
io::run cmake --build cmake-out

ci/cloudbuild/builds/clang-tidy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fi
4747
io::run cmake "${cmake_args[@]}" \
4848
-DCMAKE_CXX_CLANG_TIDY=/usr/local/bin/clang-tidy-wrapper \
4949
-DGOOGLE_CLOUD_CPP_ENABLE_CLANG_ABI_COMPAT_17=ON \
50-
-DCMAKE_CXX_STANDARD=14 \
50+
-DCMAKE_CXX_STANDARD=17 \
5151
-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=ON \
5252
-DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" \
5353
-DGOOGLE_CLOUD_CPP_INTERNAL_DOCFX="${enable_docfx}"

ci/cloudbuild/builds/cmake-gcs-rest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ mapfile -t cmake_args < <(cmake::common_args)
3030
read -r ENABLED_FEATURES < <(features::always_build_cmake)
3131
readonly ENABLED_FEATURES
3232

33-
io::run cmake "${cmake_args[@]}" -DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}"
33+
io::run cmake "${cmake_args[@]}" -DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" -DCMAKE_CXX_STANDARD=17
3434
io::run cmake --build cmake-out
3535
mapfile -t ctest_args < <(ctest::common_args)
3636
io::run env -C cmake-out GOOGLE_CLOUD_CPP_STORAGE_HAVE_REST_CLIENT=yes \

ci/cloudbuild/builds/cmake-install.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ readonly ENABLED_FEATURES
3535
# Compiles and installs all libraries and headers.
3636
cmake "${cmake_args[@]}" \
3737
-DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
38+
-DCMAKE_CXX_STANDARD=17 \
3839
-DCMAKE_INSTALL_MESSAGE=NEVER \
3940
-DGOOGLE_CLOUD_CPP_ENABLE_CLANG_ABI_COMPAT_17=ON \
4041
-DBUILD_TESTING=OFF \

0 commit comments

Comments
 (0)