[grpc] update to 1.37.0 (#17496)

7 files changed, 56 insertions, 104 deletions

diff --git a/ports/grpc/00009-use-system-upb.patch b/ports/grpc/00009-use-system-upb.patch
index e927d6d0e..32946ceef 100644
--- a/ports/grpc/00009-use-system-upb.patch
+++ b/ports/grpc/00009-use-system-upb.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt

-index c848b50605..7822c4f713 100644

+index c87e35a..24b619f 100644

 --- a/CMakeLists.txt

 +++ b/CMakeLists.txt

 @@ -84,6 +84,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package")

@@ -12,87 +12,32 @@ index c848b50605..7822c4f713 100644
  set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package")

  set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE")

  

-@@ -2037,7 +2040,6 @@ target_link_libraries(grpc

-   ${_gRPC_ALLTARGETS_LIBRARIES}

-   gpr

-   address_sorting

--  upb

-   absl::optional

-   absl::strings

-   absl::statusor

-@@ -2122,7 +2124,6 @@ target_link_libraries(grpc_csharp_ext

-   grpc

+@@ -2079,7 +2082,6 @@ target_link_libraries(grpc

    gpr

+   ${_gRPC_SSL_LIBRARIES}

    address_sorting

 -  upb

  )

- 

- 

-@@ -2590,7 +2591,6 @@ target_link_libraries(grpc_unsecure

-   ${_gRPC_ALLTARGETS_LIBRARIES}

-   gpr

-   address_sorting

--  upb

-   absl::optional

-   absl::strings

+ if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)

+   target_link_libraries(grpc "-framework CoreFoundation")

+@@ -2624,7 +2626,6 @@ target_link_libraries(grpc_unsecure

    absl::statusor

-@@ -2792,7 +2792,6 @@ target_link_libraries(grpc++

-   grpc

-   gpr

-   address_sorting

--  upb

- )

- 

- foreach(_hdr

-@@ -3040,7 +3039,6 @@ target_link_libraries(grpc++_alts

-   grpc

-   gpr

-   address_sorting

--  upb

- )

- 

- foreach(_hdr

-@@ -3104,7 +3102,6 @@ target_link_libraries(grpc++_error_details

-   grpc

    gpr

    address_sorting

 -  upb

  )

- 

- foreach(_hdr

-@@ -3174,7 +3171,6 @@ target_link_libraries(grpc++_reflection

-   grpc

-   gpr

-   address_sorting

--  upb

- )

- 

- foreach(_hdr

-@@ -3454,7 +3450,6 @@ target_link_libraries(grpc++_unsecure

-   grpc_unsecure

-   gpr

-   address_sorting

--  upb

- )

- 

- foreach(_hdr

-@@ -3773,7 +3768,6 @@ target_link_libraries(grpcpp_channelz

-   grpc

-   gpr

-   address_sorting

--  upb

- )

- 

- foreach(_hdr

-@@ -3799,6 +3793,7 @@ endif()

- 

+ if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)

+   target_link_libraries(grpc_unsecure "-framework CoreFoundation")

+@@ -3805,7 +3806,7 @@ if(gRPC_INSTALL)

  endif()

  

+ endif()

+-

 +if (gRPC_UPB_PROVIDER STREQUAL "module")

  add_library(upb

    third_party/upb/upb/decode_fast.c

    third_party/upb/upb/decode.c

-@@ -3857,7 +3852,7 @@ if(gRPC_INSTALL)

+@@ -3863,7 +3864,7 @@ if(gRPC_INSTALL)

    )

  endif()

  

@@ -102,7 +47,7 @@ index c848b50605..7822c4f713 100644
  add_executable(check_epollexclusive

    test/build/check_epollexclusive.c

 diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in

-index 3623f4aa5e..df6ced560e 100644

+index 3623f4a..df6ced5 100644

 --- a/cmake/gRPCConfig.cmake.in

 +++ b/cmake/gRPCConfig.cmake.in

 @@ -8,6 +8,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)

@@ -114,10 +59,10 @@ index 3623f4aa5e..df6ced560e 100644
  # Targets

  include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake)

 diff --git a/cmake/upb.cmake b/cmake/upb.cmake

-index f2a0e508c3..ecce7ba300 100644

+index f2a0e50..c1c65f5 100644

 --- a/cmake/upb.cmake

 +++ b/cmake/upb.cmake

-@@ -12,9 +12,20 @@

+@@ -12,9 +12,21 @@

  # See the License for the specific language governing permissions and

  # limitations under the License.

  

@@ -131,6 +76,7 @@ index f2a0e508c3..ecce7ba300 100644
  

  set(_gRPC_UPB_LIBRARIES upb)

 +

++

 +elseif(gRPC_UPB_PROVIDER STREQUAL "package")

 +    find_package(upb CONFIG REQUIRED)

 +    set(_gRPC_UPB_LIBRARIES upb::upb)

diff --git a/ports/grpc/00010-add-feature-absl-sync.patch b/ports/grpc/00010-add-feature-absl-sync.patch
index 508461843..e208070a9 100644
--- a/ports/grpc/00010-add-feature-absl-sync.patch
+++ b/ports/grpc/00010-add-feature-absl-sync.patch
@@ -1,27 +1,27 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt

-index 7822c4f713..4cb75e6eea 100644

+index 24b619f..f7a11b9 100644

 --- a/CMakeLists.txt

 +++ b/CMakeLists.txt

-@@ -2047,6 +2047,8 @@ target_link_libraries(grpc

-   absl::bind_front

-   absl::inlined_vector

-   absl::flat_hash_set

+@@ -2076,6 +2076,8 @@ target_link_libraries(grpc

+   ${_gRPC_UPB_LIBRARIES}

+   ${_gRPC_ALLTARGETS_LIBRARIES}

+   absl::flat_hash_map

 +  absl::time

 +  absl::synchronization

-   absl::flat_hash_map

- )

- if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)

-@@ -2596,6 +2598,8 @@ target_link_libraries(grpc_unsecure

+   absl::inlined_vector

+   absl::bind_front

    absl::statusor

-   absl::status

+@@ -2623,6 +2625,8 @@ target_link_libraries(grpc_unsecure

+   ${_gRPC_ALLTARGETS_LIBRARIES}

+   absl::flat_hash_map

    absl::inlined_vector

 +  absl::time

 +  absl::synchronization

-   absl::flat_hash_map

- )

- if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC)

+   absl::statusor

+   gpr

+   address_sorting

 diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake

-index 078d495417..b6f50bd14c 100644

+index 078d495..b6f50bd 100644

 --- a/cmake/abseil-cpp.cmake

 +++ b/cmake/abseil-cpp.cmake

 @@ -37,4 +37,7 @@ elseif(gRPC_ABSL_PROVIDER STREQUAL "package")

diff --git a/ports/grpc/00012-fix-use-cxx17.patch b/ports/grpc/00012-fix-use-cxx17.patch
index 012db102b..ea425c963 100644
--- a/ports/grpc/00012-fix-use-cxx17.patch
+++ b/ports/grpc/00012-fix-use-cxx17.patch
@@ -1,16 +1,17 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1911144..c749d28 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -257,6 +257,11 @@ include(cmake/re2.cmake)
- include(cmake/ssl.cmake)
- include(cmake/upb.cmake)
- include(cmake/zlib.cmake)
-+ 
-+if (ABSL_USE_CXX17)
-+    message(STATUS "Found absl uses CXX17, enable CXX17 feature.")
-+    set(CMAKE_CXX_STANDARD 17)
-+endif()
- 
- if(_gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_IOS)
-   set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m pthread)
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 4573027..4615602 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -271,6 +271,12 @@ include(cmake/upb.cmake)

+ include(cmake/xxhash.cmake)

+ include(cmake/zlib.cmake)

+ 

++ 

++if (ABSL_USE_CXX17)

++    message(STATUS "Found absl uses CXX17, enable CXX17 feature.")

++    set(CMAKE_CXX_STANDARD 17)

++endif()

++

+ if(_gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_IOS)

+   set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m pthread)

+ elseif(_gRPC_PLATFORM_ANDROID)

diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
index 249d9ef17..fb05b0c59 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO grpc/grpc
-    REF 3e53dbe8213137d2c731ecd4d88ebd2948941d75  # v1.36.4
-    SHA512 c207720a66dae97727e94f2587d6be8e4cb479997cc0815a15f5465ff94f6d0b410523e3fed2dd31385cc9d50ab52dfe39b6095257d6ce9a71184ada6ef0ff7e
+    REF 44c40ac23023b7b3dd82744372c06817cc203898  # v1.37.0
+    SHA512 dacd85b3a94cb759a086239aa2661f1b93728a1554ebc0f10c42aeb49c0d6309963832324773c3a153c3d2fcf807cb55b0e197b128e0a4e199c9e19a3976abd6
     HEAD_REF master
     PATCHES
         00001-fix-uwp.patch
diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json
index 4ec5a5b96..976e2700c 100644
--- a/ports/grpc/vcpkg.json
+++ b/ports/grpc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "grpc",
-  "version-semver": "1.36.4",
+  "version-semver": "1.37.0",
   "description": "An RPC library and framework",
   "homepage": "https://github.com/grpc/grpc",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 1f99cce7b..8b3a9268f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2357,7 +2357,7 @@
       "port-version": 0
     },
     "grpc": {
-      "baseline": "1.36.4",
+      "baseline": "1.37.0",
       "port-version": 0
     },
     "grppi": {
diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json
index f0b14b8e5..1ef6c9c33 100644
--- a/versions/g-/grpc.json
+++ b/versions/g-/grpc.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "948866c5f70f79855a8cdb961af79701e46dc63e",
+      "version-semver": "1.37.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "437c7b28d6eb5054924c3c00e529a32aef74b437",
       "version-semver": "1.36.4",
       "port-version": 0