Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[google-cloud-cpp] update to latest release (v2.14.0) #32881

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ports/google-cloud-cpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO googleapis/google-cloud-cpp
REF "v${VERSION}"
SHA512 b708945b5cdfe49e17208f7ff372064cce8844c0ed9e0a60f291a4a0b4d01b886997e8365e3802740d8914e58426d91cf3db1b37261c60d9661579212231c2ee
SHA512 c7fd2445339fbb9f66d6863693feff456fa14381e83f3e28456aed2e8102c8d776868afa1a5020874672306f68e911f199b5ce667c61708166925c63877e8c5d
HEAD_REF main
PATCHES
support_absl_cxx17.patch
Expand All @@ -14,8 +14,10 @@ vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc")

set(GOOGLE_CLOUD_CPP_ENABLE "${FEATURES}")
list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "core")
# This feature does not exist, but allows us to simplify the vcpkg.json file.
# This feature does not exist, but allows us to simplify the vcpkg.json
# file.
list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "grpc-common")
list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "rest-common")
list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "googleapis")
# google-cloud-cpp uses dialogflow_cx and dialogflow_es. Underscores
# are invalid in `vcpkg` features, we use dashes (`-`) as a separator
Expand Down
48 changes: 43 additions & 5 deletions ports/google-cloud-cpp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "google-cloud-cpp",
"version": "2.13.0",
"version": "2.14.0",
"description": "C++ Client Libraries for Google Cloud Platform APIs.",
"homepage": "https://github.com/googleapis/google-cloud-cpp",
"license": "Apache-2.0",
Expand Down Expand Up @@ -295,6 +295,18 @@
}
]
},
"commerce": {
"description": "Cloud Commerce C++ Client Library",
"dependencies": [
{
"name": "google-cloud-cpp",
"default-features": false,
"features": [
"grpc-common"
]
}
]
},
"composer": {
"description": "Cloud Composer C++ Client Library",
"dependencies": [
Expand Down Expand Up @@ -536,6 +548,20 @@
}
]
},
"experimental-opentelemetry": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you missed the new commerce feature.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added.

"description": "OpenTelemetry C++ GCP Exporter Library",
"dependencies": [
{
"name": "google-cloud-cpp",
"default-features": false,
"features": [
"rest-common",
"trace"
]
},
"opentelemetry-cpp"
]
},
"experimental-storage-grpc": {
"description": "The GCS+gRPC plugin",
"dependencies": [
Expand Down Expand Up @@ -984,6 +1010,18 @@
}
]
},
"rest-common": {
"description": "Dependencies used by all REST-based libraries",
"dependencies": [
{
"name": "curl",
"features": [
"ssl"
]
},
"nlohmann-json"
]
},
"retail": {
"description": "Retail API C++ Client Library",
"dependencies": [
Expand Down Expand Up @@ -1133,12 +1171,12 @@
"dependencies": [
"crc32c",
{
"name": "curl",
"name": "google-cloud-cpp",
"default-features": false,
"features": [
"ssl"
"rest-common"
]
},
"nlohmann-json"
}
]
},
"storageinsights": {
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2949,7 +2949,7 @@
"port-version": 3
},
"google-cloud-cpp": {
"baseline": "2.13.0",
"baseline": "2.14.0",
"port-version": 0
},
"google-cloud-cpp-common": {
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/google-cloud-cpp.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "696c1d17cd2174ffde1c0d53779b76e8d98d924a",
"version": "2.14.0",
"port-version": 0
},
{
"git-tree": "c067a236b62d38d1f56a658b086039bf22441c4a",
"version": "2.13.0",
Expand Down