From c401516b95095c80f1bbceedec67d7b6eac362b3 Mon Sep 17 00:00:00 2001
From: Darren Bolduc <dbolduc@google.com>
Date: Fri, 4 Oct 2024 11:42:52 -0400
Subject: [PATCH] [google-cloud-cpp] update to the latest release (v2.30.0)
 (#41323)

---
 ports/google-cloud-cpp/portfile.cmake |  8 +++----
 ports/google-cloud-cpp/vcpkg.json     | 30 +++++++++++++--------------
 versions/baseline.json                |  2 +-
 versions/g-/google-cloud-cpp.json     |  5 +++++
 4 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake
index 2dd0ad6f61..73af5be3c4 100644
--- a/ports/google-cloud-cpp/portfile.cmake
+++ b/ports/google-cloud-cpp/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO googleapis/google-cloud-cpp
     REF "v${VERSION}"
-    SHA512 0ea58e933f5b57cd7c734c8139c3e334d1427a255b918cbabb35d909e9b5faf8a89bf174cff55468ea97ab7f472d96236c573093fc279fdccb0af64747f2af3a
+    SHA512 9020e5f762285df163b91ac8cea3198d5744a772374237959896a5e5837010de87b8f637b13ac96effde2053217bb91e1275ab9a0e27bf946e0189b2289b29ef
     HEAD_REF main
 )
 
@@ -31,9 +31,9 @@ if ("dialogflow-es" IN_LIST FEATURES)
     list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "dialogflow-es")
     list(APPEND GOOGLE_CLOUD_CPP_ENABLE "dialogflow_es")
 endif ()
-if ("experimental-storage-grpc" IN_LIST FEATURES)
-    list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "experimental-storage-grpc")
-    list(APPEND GOOGLE_CLOUD_CPP_ENABLE "experimental-storage_grpc")
+if ("storage-grpc" IN_LIST FEATURES)
+    list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "storage-grpc")
+    list(APPEND GOOGLE_CLOUD_CPP_ENABLE "storage_grpc")
 endif ()
 
 vcpkg_cmake_configure(
diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json
index d24fe17b6a..8a76777c3b 100644
--- a/ports/google-cloud-cpp/vcpkg.json
+++ b/ports/google-cloud-cpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "google-cloud-cpp",
-  "version": "2.29.0",
+  "version": "2.30.0",
   "description": "C++ Client Libraries for Google Cloud Platform APIs.",
   "homepage": "https://github.com/googleapis/google-cloud-cpp",
   "license": "Apache-2.0",
@@ -722,20 +722,6 @@
         }
       ]
     },
-    "experimental-storage-grpc": {
-      "description": "The GCS+gRPC plugin",
-      "dependencies": [
-        {
-          "name": "google-cloud-cpp",
-          "default-features": false,
-          "features": [
-            "grpc-common",
-            "opentelemetry",
-            "storage"
-          ]
-        }
-      ]
-    },
     "filestore": {
       "description": "Cloud Filestore API C++ Client Library",
       "dependencies": [
@@ -1512,6 +1498,20 @@
         }
       ]
     },
+    "storage-grpc": {
+      "description": "The GCS+gRPC plugin",
+      "dependencies": [
+        {
+          "name": "google-cloud-cpp",
+          "default-features": false,
+          "features": [
+            "grpc-common",
+            "opentelemetry",
+            "storage"
+          ]
+        }
+      ]
+    },
     "storagecontrol": {
       "description": "Cloud Storage Control API C++ Client Library",
       "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index db19113eb7..90d457dedd 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3189,7 +3189,7 @@
       "port-version": 0
     },
     "google-cloud-cpp": {
-      "baseline": "2.29.0",
+      "baseline": "2.30.0",
       "port-version": 0
     },
     "google-cloud-cpp-common": {
diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json
index 9c78de594d..e6f326952b 100644
--- a/versions/g-/google-cloud-cpp.json
+++ b/versions/g-/google-cloud-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "50da62f4ab118b0cec820174bf07744014b03591",
+      "version": "2.30.0",
+      "port-version": 0
+    },
     {
       "git-tree": "13cd537faaf0b58a05831fd38ce7e1d9950709dc",
       "version": "2.29.0",