From 56f5bb456fe7e76598b2e42a88caba52161c5b4e Mon Sep 17 00:00:00 2001 From: Hannah Shi Date: Mon, 29 Jan 2024 15:14:57 -0800 Subject: [PATCH] [ObjC] Update swift package (#35686) Fix issues found in 1.61.0-pre1 swift package release ref: https://github.com/grpc/grpc-ios/pull/224 Will need to back port to 1.61.x branch Closes #35686 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/35686 from HannahShiSFB:update-swift-package 9589fd5fec18231cb90c99a9875266064ff56d96 PiperOrigin-RevId: 602514111 --- Package.swift | 45 +++++++++++++++++++++++++++++--- build_handwritten.yaml | 1 + templates/Package.swift.template | 6 ++--- 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index 16a12d054f8..5bbde1b5430 100644 --- a/Package.swift +++ b/Package.swift @@ -23,7 +23,7 @@ let package = Package( ], dependencies: [ - .package(url: "https://github.com/firebase/abseil-cpp-SwiftPM.git", "0.20220623.0"..<"0.20220624.0"), + .package(url: "https://github.com/firebase/abseil-cpp-SwiftPM.git", "0.20230802.0"..<"0.20230803.0"), .package(url: "https://github.com/firebase/boringssl-SwiftPM.git", "0.9.0"..<"0.10.0"), ], @@ -2044,11 +2044,16 @@ let package = Package( "third_party/re2/util/utf.h", "third_party/re2/util/util.h", "third_party/upb/upb/base/descriptor_constants.h", + "third_party/upb/upb/base/internal/log2.h", "third_party/upb/upb/base/status.c", "third_party/upb/upb/base/status.h", "third_party/upb/upb/base/status.hpp", "third_party/upb/upb/base/string_view.h", "third_party/upb/upb/generated_code_support.h", + "third_party/upb/upb/hash/common.c", + "third_party/upb/upb/hash/common.h", + "third_party/upb/upb/hash/int_table.h", + "third_party/upb/upb/hash/str_table.h", "third_party/upb/upb/json/decode.c", "third_party/upb/upb/json/decode.h", "third_party/upb/upb/json/encode.c", @@ -2069,7 +2074,25 @@ let package = Package( "third_party/upb/upb/mem/internal/arena.h", "third_party/upb/upb/message/accessors.c", "third_party/upb/upb/message/accessors.h", + "third_party/upb/upb/message/array.c", + "third_party/upb/upb/message/array.h", "third_party/upb/upb/message/internal/accessors.h", + "third_party/upb/upb/message/internal/array.h", + "third_party/upb/upb/message/internal/extension.h", + "third_party/upb/upb/message/internal/map.h", + "third_party/upb/upb/message/internal/map_entry.h", + "third_party/upb/upb/message/internal/map_sorter.h", + "third_party/upb/upb/message/internal/message.h", + "third_party/upb/upb/message/internal/types.h", + "third_party/upb/upb/message/map.c", + "third_party/upb/upb/message/map.h", + "third_party/upb/upb/message/map_gencode_util.h", + "third_party/upb/upb/message/map_sorter.c", + "third_party/upb/upb/message/message.c", + "third_party/upb/upb/message/message.h", + "third_party/upb/upb/message/tagged_ptr.h", + "third_party/upb/upb/message/types.h", + "third_party/upb/upb/message/value.h", "third_party/upb/upb/mini_descriptor/build_enum.c", "third_party/upb/upb/mini_descriptor/build_enum.h", "third_party/upb/upb/mini_descriptor/decode.c", @@ -2084,6 +2107,22 @@ let package = Package( "third_party/upb/upb/mini_descriptor/internal/wire_constants.h", "third_party/upb/upb/mini_descriptor/link.c", "third_party/upb/upb/mini_descriptor/link.h", + "third_party/upb/upb/mini_table/enum.h", + "third_party/upb/upb/mini_table/extension.h", + "third_party/upb/upb/mini_table/extension_registry.c", + "third_party/upb/upb/mini_table/extension_registry.h", + "third_party/upb/upb/mini_table/field.h", + "third_party/upb/upb/mini_table/file.h", + "third_party/upb/upb/mini_table/internal/enum.h", + "third_party/upb/upb/mini_table/internal/extension.h", + "third_party/upb/upb/mini_table/internal/field.h", + "third_party/upb/upb/mini_table/internal/file.h", + "third_party/upb/upb/mini_table/internal/message.c", + "third_party/upb/upb/mini_table/internal/message.h", + "third_party/upb/upb/mini_table/internal/sub.h", + "third_party/upb/upb/mini_table/message.c", + "third_party/upb/upb/mini_table/message.h", + "third_party/upb/upb/mini_table/sub.h", "third_party/upb/upb/port/atomic.h", "third_party/upb/upb/port/def.inc", "third_party/upb/upb/port/undef.inc", @@ -2160,10 +2199,10 @@ let package = Package( "third_party/utf8_range/utf8_range.h", "third_party/xxhash/xxhash.h", ], - publicHeadersPath: "spm-core-include", resources: [ .copy("src/objective-c/PrivacyInfo.xcprivacy"), ], + publicHeadersPath: "spm-core-include", cSettings: [ .headerSearchPath("./"), .headerSearchPath("include/"), @@ -2209,10 +2248,10 @@ let package = Package( sources: [ "src/cpp/", ], - publicHeadersPath: "spm-cpp-include", resources: [ .copy("src/objective-c/PrivacyInfo.xcprivacy"), ], + publicHeadersPath: "spm-cpp-include", cSettings: [ .headerSearchPath("./"), .headerSearchPath("include/"), diff --git a/build_handwritten.yaml b/build_handwritten.yaml index 985b46c20fb..c40860bfc54 100644 --- a/build_handwritten.yaml +++ b/build_handwritten.yaml @@ -209,6 +209,7 @@ swift_package: - gpr - upb_base_lib - upb_mem_lib + - upb_message_lib - upb_json_lib - upb_textformat_lib - utf8_range_lib diff --git a/templates/Package.swift.template b/templates/Package.swift.template index 2c714749a95..23334c0bc8b 100644 --- a/templates/Package.swift.template +++ b/templates/Package.swift.template @@ -25,7 +25,7 @@ ], dependencies: [ - .package(url: "https://github.com/firebase/abseil-cpp-SwiftPM.git", "0.20220623.0"..<"0.20220624.0"), + .package(url: "https://github.com/firebase/abseil-cpp-SwiftPM.git", "0.20230802.0"..<"0.20230803.0"), .package(url: "https://github.com/firebase/boringssl-SwiftPM.git", "0.9.0"..<"0.10.0"), ], @@ -54,10 +54,10 @@ "${file}", % endfor ], - publicHeadersPath: "spm-core-include", resources: [ .copy("src/objective-c/PrivacyInfo.xcprivacy"), ], + publicHeadersPath: "spm-core-include", cSettings: [ .headerSearchPath("./"), .headerSearchPath("include/"), @@ -103,10 +103,10 @@ sources: [ "src/cpp/", ], - publicHeadersPath: "spm-cpp-include", resources: [ .copy("src/objective-c/PrivacyInfo.xcprivacy"), ], + publicHeadersPath: "spm-cpp-include", cSettings: [ .headerSearchPath("./"), .headerSearchPath("include/"),