natas_hw
/
grpc
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[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 9589fd5fec
PiperOrigin-RevId: 602514111
This commit is contained in:
Hannah Shi 2024-01-29 15:14:57 -08:00 committed by Copybara-Service
parent e738963398
commit 56f5bb456f
3 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Package.swift generated
View File

@ -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/"),

1
build_handwritten.yaml
View File

@ -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

6
templates/Package.swift.template
View File

@ -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/"),