Skip to content

Commit 6e89c47

Browse files
authored
Merge branch 'main' into storage-build-docs
2 parents 6c3abfe + 6aae40b commit 6e89c47

File tree

1,657 files changed

+26656
-12835
lines changed

Some content is hidden

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

1,657 files changed

+26656
-12835
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.4.0
1+
7.4.1

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ example, is this related to bigtable (i.e., something in
1111
`google/cloud/bigtable`), or GCS (i.e., something in `google/cloud/storage`)?
1212

1313
**Is your feature request related to a problem? Please describe.** A clear and
14-
concise description of what the problem is. Ex. I'm always frustrated when
15-
\[...\]
14+
concise description of what the problem is. Ex. I'm always frustrated when [...]
1615

1716
**Describe the solution you'd like** A clear and concise description of what you
1817
want to happen.

.github/workflows/windows-cmake.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,6 @@ jobs:
211211
- name: Pre Build Disk Space
212212
shell: bash
213213
run: df -m
214-
- name: Download and Install CMake
215-
shell: bash
216-
run: |
217-
choco install -y cmake --version 3.29.2 || \
218-
(sleep 60 ; choco install -y cmake --version 3.29.2) || \
219-
(sleep 120 ; choco install -y cmake --version 3.29.2)
220214
- name: Download and Install sccache
221215
if: ${{ inputs.sccache-mode != 'DISABLED' }}
222216
working-directory: "${{runner.temp}}"

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,23 @@
44
breaking changes in the upcoming 3.x release. This release is scheduled for
55
2024-12 or 2025-01.
66

7+
## v2.33.0 - TBD
8+
9+
## v2.32.0 - 2024-12
10+
11+
### [Spanner](/google/cloud/spanner/README.md)
12+
13+
- feat(spanner): add samples for MR CMEK ([#14674](https://github.com/googleapis/google-cloud-cpp/pull/14674))
14+
15+
### [Common Libraries](/google/cloud/README.md)
16+
17+
- feat(rest): support generateIdToken in impersonation url ([#14853](https://github.com/googleapis/google-cloud-cpp/pull/14853))
18+
- feat(rest): support impersonated ADC ([#14815](https://github.com/googleapis/google-cloud-cpp/pull/14815))
19+
20+
### [Google APIs interface definitions](https://github.com/googleapis/googleapis)
21+
22+
- This release is based on definitions as of [2024-11-28T13:52:13-08:00](https://github.com/googleapis/googleapis/tree/d675ec222c431e3346ba8aaf0027392fe8b3d90c)
23+
724
## v2.31.0 - 2024-11
825

926
### New Libraries

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ set(PACKAGE_BUGREPORT "https://github.com/googleapis/google-cloud-cpp/issues")
2121

2222
project(
2323
google-cloud-cpp
24-
VERSION 2.31.0
24+
VERSION 2.33.0
2525
LANGUAGES CXX)
26-
set(PROJECT_VERSION_PRE_RELEASE "")
26+
set(PROJECT_VERSION_PRE_RELEASE "rc")
2727

2828
if (NOT "${PROJECT_VERSION_PRE_RELEASE}" STREQUAL "")
2929
set(PROJECT_VERSION "${PROJECT_VERSION}-${PROJECT_VERSION_PRE_RELEASE}")

MODULE.bazel

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

1717
module(
1818
name = "google_cloud_cpp",
19-
version = "2.31.0", # Updated by CMake
19+
version = "2.33.0-rc", # Updated by CMake
2020
compatibility_level = 2, # Updated by CMake
2121
)
2222

2323
bazel_dep(name = "platforms", version = "0.0.10")
2424
bazel_dep(name = "bazel_skylib", version = "1.7.1")
2525
bazel_dep(name = "rules_cc", version = "0.0.9")
2626
bazel_dep(name = "abseil-cpp", version = "20240722.0", repo_name = "com_google_absl")
27-
bazel_dep(name = "protobuf", version = "28.3", repo_name = "com_google_protobuf")
27+
bazel_dep(name = "protobuf", version = "29.1", repo_name = "com_google_protobuf")
2828
bazel_dep(name = "boringssl", version = "0.0.0-20230215-5c22014")
29-
bazel_dep(name = "grpc", version = "1.66.0", repo_name = "com_github_grpc_grpc")
29+
bazel_dep(name = "grpc", version = "1.68.0", repo_name = "com_github_grpc_grpc")
3030
bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "com_github_nlohmann_json")
3131
bazel_dep(name = "curl", version = "8.8.0.bcr.1", repo_name = "com_github_curl_curl")
3232
bazel_dep(name = "crc32c", version = "1.1.0", repo_name = "com_github_google_crc32c")
3333
bazel_dep(name = "opentelemetry-cpp", version = "1.16.0", repo_name = "io_opentelemetry_cpp")
34-
bazel_dep(name = "rules_proto", version = "7.0.1")
35-
bazel_dep(name = "rules_python", version = "0.37.2")
34+
bazel_dep(name = "rules_proto", version = "7.0.2")
35+
bazel_dep(name = "rules_python", version = "1.0.0")
3636

3737
bazel_dep(name = "googletest", version = "1.15.2", dev_dependency = True, repo_name = "com_google_googletest")
3838
bazel_dep(name = "google_benchmark", version = "1.8.5", dev_dependency = True, repo_name = "com_google_benchmark")
@@ -52,12 +52,12 @@ python.toolchain(
5252
bazel_dep(name = "googleapis", version = "0.0.0", repo_name = "com_google_googleapis")
5353
archive_override(
5454
module_name = "googleapis",
55-
integrity = "sha256-8GamJKPP1S08PljJcSwO0IS9WEy4nl3d7gKcuy0LF5Y=",
55+
integrity = "sha256-B9C8wQIemnTrAU+vRg/93P816tjLJZjrNpLjmUT7qOg=",
5656
patch_strip = 1,
5757
patches = ["//bazel:googleapis.modules.patch"],
58-
strip_prefix = "googleapis-b7c5b60ee76c4591e32c874978c6cd8231087ed6",
58+
strip_prefix = "googleapis-d675ec222c431e3346ba8aaf0027392fe8b3d90c",
5959
urls = [
60-
"https://github.com/googleapis/googleapis/archive/b7c5b60ee76c4591e32c874978c6cd8231087ed6.tar.gz",
60+
"https://github.com/googleapis/googleapis/archive/d675ec222c431e3346ba8aaf0027392fe8b3d90c.tar.gz",
6161
],
6262
)
6363

0 commit comments

Comments
 (0)