From a9c18086b7e2a624bc977b8dac8e0ce98098644f Mon Sep 17 00:00:00 2001 From: Jarem Forster Date: Fri, 31 Mar 2023 09:16:10 +0200 Subject: [PATCH 1/2] Update to Xcode 14 / Swift 5.7 This requires dropping support for iOS/tvOS <11, macOS < 10.13, watchOS < 4. --- PromiseKit.podspec | 130 +++++++++++++-------------- PromiseKit.xcodeproj/project.pbxproj | 42 ++++++++- 2 files changed, 103 insertions(+), 69 deletions(-) diff --git a/PromiseKit.podspec b/PromiseKit.podspec index 49b03b49a..68b802738 100644 --- a/PromiseKit.podspec +++ b/PromiseKit.podspec @@ -19,15 +19,15 @@ Pod::Spec.new do |s| s.default_subspecs = 'CorePromise', 'UIKit', 'Foundation' s.requires_arc = true - s.swift_versions = ['3.2', '3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1', '5.2', '5.3', '5.4', '5.5'] + s.swift_versions = ['3.2', '3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1', '5.2', '5.3', '5.4', '5.5', '5.8'] # CocoaPods requires us to specify the root deployment targets # even though for us it is nonsense. Our root spec has no # sources. - s.ios.deployment_target = '8.0' - s.osx.deployment_target = '10.10' - s.watchos.deployment_target = '2.0' - s.tvos.deployment_target = '9.0' + s.ios.deployment_target = '11.0' + s.osx.deployment_target = '10.13' + s.watchos.deployment_target = '4.0' + s.tvos.deployment_target = '11.0' s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-DPMKCocoaPods', @@ -38,8 +38,8 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/Accounts/Sources/*.plist' ss.ios.frameworks = ss.osx.frameworks = 'Accounts' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '8.0' - ss.osx.deployment_target = '10.10' + ss.ios.deployment_target = '11.0' + ss.osx.deployment_target = '10.13' end s.subspec 'Alamofire' do |ss| @@ -47,10 +47,10 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/Alamofire/Sources/*.plist' ss.dependency 'Alamofire', '~> 4.0' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '8.0' + ss.ios.deployment_target = '11.0' ss.osx.deployment_target = '10.11' - ss.watchos.deployment_target = '2.0' - ss.tvos.deployment_target = '9.0' + ss.watchos.deployment_target = '4.0' + ss.tvos.deployment_target = '11.0' end s.subspec 'AddressBook' do |ss| @@ -58,7 +58,7 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/AddressBook/Sources/*.plist' ss.ios.frameworks = 'AddressBook' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '8.0' + ss.ios.deployment_target = '11.0' end s.subspec 'AssetsLibrary' do |ss| @@ -66,7 +66,7 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/AssetsLibrary/Sources/*.plist' ss.ios.frameworks = 'AssetsLibrary' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '8.0' + ss.ios.deployment_target = '11.0' end s.subspec 'AVFoundation' do |ss| @@ -74,7 +74,7 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/AVFoundation/Sources/*.plist' ss.ios.frameworks = 'AVFoundation' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '8.0' + ss.ios.deployment_target = '11.0' end s.subspec 'Bolts' do |ss| @@ -82,10 +82,10 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/Bolts/Sources/*.plist' ss.dependency 'PromiseKit/CorePromise' ss.dependency 'Bolts', '~> 1.9.0' - ss.ios.deployment_target = '8.0' - ss.osx.deployment_target = '10.10' - ss.watchos.deployment_target = '2.0' - ss.tvos.deployment_target = '9.0' + ss.ios.deployment_target = '11.0' + ss.osx.deployment_target = '10.13' + ss.watchos.deployment_target = '4.0' + ss.tvos.deployment_target = '11.0' end s.subspec 'CloudKit' do |ss| @@ -96,7 +96,7 @@ Pod::Spec.new do |s| ss.ios.deployment_target = '10.0' ss.osx.deployment_target = '10.12' ss.tvos.deployment_target = '10.0' - ss.watchos.deployment_target = '3.0' + ss.watchos.deployment_target = '4.0' end s.subspec 'CoreBluetooth' do |ss| @@ -104,9 +104,9 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/CoreBluetooth/Sources/*.plist' ss.ios.frameworks = ss.osx.frameworks = ss.tvos.frameworks = 'CoreBluetooth' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '8.0' - ss.osx.deployment_target = '10.10' - ss.tvos.deployment_target = '9.0' + ss.ios.deployment_target = '11.0' + ss.osx.deployment_target = '10.13' + ss.tvos.deployment_target = '11.0' end s.subspec 'CorePromise' do |ss| @@ -122,10 +122,10 @@ Pod::Spec.new do |s| ss.preserve_paths = 'Sources/AnyPromise+Private.h', 'Sources/PMKCallVariadicBlock.m', 'Sources/NSMethodSignatureForBlock.m' ss.frameworks = 'Foundation' - ss.ios.deployment_target = '8.0' - ss.osx.deployment_target = '10.10' - ss.watchos.deployment_target = '2.0' - ss.tvos.deployment_target = '9.0' + ss.ios.deployment_target = '11.0' + ss.osx.deployment_target = '10.13' + ss.watchos.deployment_target = '4.0' + ss.tvos.deployment_target = '11.0' end s.subspec 'CoreLocation' do |ss| @@ -135,10 +135,10 @@ Pod::Spec.new do |s| ss.dependency 'PromiseKit/CorePromise' ss.frameworks = 'CoreLocation' - ss.ios.deployment_target = '8.0' - ss.osx.deployment_target = '10.10' - ss.watchos.deployment_target = '3.0' - ss.tvos.deployment_target = '9.0' + ss.ios.deployment_target = '11.0' + ss.osx.deployment_target = '10.13' + ss.watchos.deployment_target = '4.0' + ss.tvos.deployment_target = '11.0' end s.subspec 'EventKit' do |ss| @@ -147,9 +147,9 @@ Pod::Spec.new do |s| ss.ios.frameworks = ss.osx.frameworks = ss.watchos.frameworks = 'EventKit' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '8.0' - ss.osx.deployment_target = '10.10' - ss.watchos.deployment_target = '2.0' + ss.ios.deployment_target = '11.0' + ss.osx.deployment_target = '10.13' + ss.watchos.deployment_target = '4.0' end s.subspec 'Foundation' do |ss| @@ -157,10 +157,10 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/Foundation/Sources/*.plist' ss.dependency 'PromiseKit/CorePromise' ss.frameworks = 'Foundation' - ss.ios.deployment_target = '8.0' - ss.osx.deployment_target = '10.10' - ss.watchos.deployment_target = '2.0' - ss.tvos.deployment_target = '9.0' + ss.ios.deployment_target = '11.0' + ss.osx.deployment_target = '10.13' + ss.watchos.deployment_target = '4.0' + ss.tvos.deployment_target = '11.0' end s.subspec 'HealthKit' do |ss| @@ -169,7 +169,7 @@ Pod::Spec.new do |s| ss.dependency 'PromiseKit/CorePromise' ss.frameworks = 'HealthKit' ss.ios.deployment_target = '9.0' - ss.watchos.deployment_target = '2.0' + ss.watchos.deployment_target = '4.0' end s.subspec 'HomeKit' do |ss| @@ -177,9 +177,9 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/HomeKit/Sources/*.plist' ss.dependency 'PromiseKit/CorePromise' ss.frameworks = 'HomeKit' - ss.ios.deployment_target = '8.0' - ss.watchos.deployment_target = '3.0' - ss.tvos.deployment_target = '9.0' + ss.ios.deployment_target = '11.0' + ss.watchos.deployment_target = '4.0' + ss.tvos.deployment_target = '11.0' end s.subspec 'MapKit' do |ss| @@ -187,9 +187,9 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/MapKit/Sources/*.plist' ss.ios.frameworks = ss.osx.frameworks = ss.tvos.frameworks = 'MapKit' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '8.0' - ss.osx.deployment_target = '10.10' - ss.watchos.deployment_target = '2.0' + ss.ios.deployment_target = '11.0' + ss.osx.deployment_target = '10.13' + ss.watchos.deployment_target = '4.0' ss.tvos.deployment_target = '9.2' end @@ -198,7 +198,7 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/MessagesUI/Sources/*.plist' ss.ios.frameworks = 'MessageUI' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '8.0' + ss.ios.deployment_target = '11.0' end s.subspec 'OMGHTTPURLRQ' do |ss| @@ -206,10 +206,10 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/OMGHTTPURLRQ/Sources/*.plist' ss.dependency 'PromiseKit/Foundation' ss.dependency 'OMGHTTPURLRQ', '~> 3.2' - ss.ios.deployment_target = '8.0' - ss.osx.deployment_target = '10.10' - ss.watchos.deployment_target = '2.0' - ss.tvos.deployment_target = '9.0' + ss.ios.deployment_target = '11.0' + ss.osx.deployment_target = '10.13' + ss.watchos.deployment_target = '4.0' + ss.tvos.deployment_target = '11.0' end s.subspec 'Photos' do |ss| @@ -218,7 +218,7 @@ Pod::Spec.new do |s| ss.ios.frameworks = ss.tvos.frameworks = ss.osx.frameworks = 'Photos' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '8.0' + ss.ios.deployment_target = '11.0' ss.osx.deployment_target = '10.13' ss.tvos.deployment_target = '10.0' end @@ -228,9 +228,9 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/QuartzCore/Sources/*.plist' ss.osx.frameworks = ss.ios.frameworks = ss.tvos.frameworks = 'QuartzCore' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '8.0' - ss.osx.deployment_target = '10.10' - ss.tvos.deployment_target = '9.0' + ss.ios.deployment_target = '11.0' + ss.osx.deployment_target = '10.13' + ss.tvos.deployment_target = '11.0' end s.subspec 'Social' do |ss| @@ -239,8 +239,8 @@ Pod::Spec.new do |s| ss.osx.source_files = Dir['Extensions/Social/Sources/*'] - ['Categories/Social/Sources/*SLComposeViewController+Promise.swift'] ss.ios.frameworks = ss.osx.frameworks = 'Social' ss.dependency 'PromiseKit/Foundation' - ss.ios.deployment_target = '8.0' - ss.osx.deployment_target = '10.10' + ss.ios.deployment_target = '11.0' + ss.osx.deployment_target = '10.13' end s.subspec 'StoreKit' do |ss| @@ -248,9 +248,9 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/StoreKit/Sources/*.plist' ss.ios.frameworks = ss.osx.frameworks = ss.tvos.frameworks = 'StoreKit' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '8.0' - ss.osx.deployment_target = '10.10' - ss.tvos.deployment_target = '9.0' + ss.ios.deployment_target = '11.0' + ss.osx.deployment_target = '10.13' + ss.tvos.deployment_target = '11.0' end s.subspec 'SystemConfiguration' do |ss| @@ -258,9 +258,9 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/SystemConfiguration/Sources/*.plist' ss.ios.frameworks = ss.osx.frameworks = ss.tvos.frameworks = 'SystemConfiguration' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '8.0' - ss.osx.deployment_target = '10.10' - ss.tvos.deployment_target = '9.0' + ss.ios.deployment_target = '11.0' + ss.osx.deployment_target = '10.13' + ss.tvos.deployment_target = '11.0' end picker_cc = 'Extensions/UIKit/Sources/UIImagePickerController+Promise.swift' @@ -270,8 +270,8 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/UIKit/Sources/*.plist' ss.tvos.frameworks = ss.ios.frameworks = 'UIKit' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '8.0' - ss.tvos.deployment_target = '9.0' + ss.ios.deployment_target = '11.0' + ss.tvos.deployment_target = '11.0' end s.subspec 'UIImagePickerController' do |ss| @@ -288,7 +288,7 @@ Pod::Spec.new do |s| ss.ios.frameworks = 'UIKit' ss.ios.xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => '$(inherited) PMKImagePickerController=1' } ss.dependency 'PromiseKit/UIKit' - ss.ios.deployment_target = '8.0' + ss.ios.deployment_target = '11.0' end s.subspec 'WatchConnectivity' do |ss| @@ -296,7 +296,7 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/WatchConnectivity/Sources/*.plist' ss.ios.frameworks = ss.watchos.frameworks = 'WatchConnectivity' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '8.0' - ss.watchos.deployment_target = '2.0' + ss.ios.deployment_target = '11.0' + ss.watchos.deployment_target = '4.0' end end diff --git a/PromiseKit.xcodeproj/project.pbxproj b/PromiseKit.xcodeproj/project.pbxproj index 407ce8135..11493d20f 100644 --- a/PromiseKit.xcodeproj/project.pbxproj +++ b/PromiseKit.xcodeproj/project.pbxproj @@ -838,9 +838,10 @@ IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.12; + MACOSX_DEPLOYMENT_TARGET = 10.13; SWIFT_INSTALL_OBJC_HEADER = NO; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Debug; }; @@ -851,9 +852,10 @@ IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.12; + MACOSX_DEPLOYMENT_TARGET = 10.13; SWIFT_INSTALL_OBJC_HEADER = NO; - TVOS_DEPLOYMENT_TARGET = 10.1; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Release; }; @@ -863,8 +865,11 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.13; SWIFT_INSTALL_OBJC_HEADER = NO; SWIFT_OBJC_BRIDGING_HEADER = Tests/Bridging/Infrastructure.h; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Debug; }; @@ -874,8 +879,11 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.13; SWIFT_INSTALL_OBJC_HEADER = NO; SWIFT_OBJC_BRIDGING_HEADER = Tests/Bridging/Infrastructure.h; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Release; }; @@ -885,7 +893,10 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.13; SWIFT_INSTALL_OBJC_HEADER = NO; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Debug; }; @@ -895,7 +906,10 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks @loader_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.13; SWIFT_INSTALL_OBJC_HEADER = NO; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Release; }; @@ -905,9 +919,12 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_INSTALL_OBJC_HEADER = NO; SWIFT_SUPPRESS_WARNINGS = YES; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Debug; }; @@ -917,9 +934,12 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_INSTALL_OBJC_HEADER = NO; SWIFT_SUPPRESS_WARNINGS = YES; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Release; }; @@ -1089,12 +1109,16 @@ GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_PARAMETER = YES; GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_PACKAGE_TYPE = FMWK; SKIP_INSTALL = YES; SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; TARGETED_DEVICE_FAMILY = "1,2,3,4"; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Debug; }; @@ -1144,12 +1168,16 @@ GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_PARAMETER = YES; GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_PACKAGE_TYPE = FMWK; SKIP_INSTALL = YES; SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; TARGETED_DEVICE_FAMILY = "1,2,3,4"; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Release; }; @@ -1160,9 +1188,12 @@ CLANG_ENABLE_MODULES = YES; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_INSTALL_OBJC_HEADER = NO; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Debug; }; @@ -1173,8 +1204,11 @@ CLANG_ENABLE_MODULES = YES; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks @loader_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_INSTALL_OBJC_HEADER = NO; + TVOS_DEPLOYMENT_TARGET = 11.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Release; }; From dbe77b11bedf1171fe4c76c6a35dad7a041952f3 Mon Sep 17 00:00:00 2001 From: Jarem Forster Date: Fri, 31 Mar 2023 15:14:43 +0200 Subject: [PATCH 2/2] fixup! a9c18086b7e2a624bc977b8dac8e0ce98098644f --- PromiseKit.podspec | 130 ++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/PromiseKit.podspec b/PromiseKit.podspec index 68b802738..49b03b49a 100644 --- a/PromiseKit.podspec +++ b/PromiseKit.podspec @@ -19,15 +19,15 @@ Pod::Spec.new do |s| s.default_subspecs = 'CorePromise', 'UIKit', 'Foundation' s.requires_arc = true - s.swift_versions = ['3.2', '3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1', '5.2', '5.3', '5.4', '5.5', '5.8'] + s.swift_versions = ['3.2', '3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1', '5.2', '5.3', '5.4', '5.5'] # CocoaPods requires us to specify the root deployment targets # even though for us it is nonsense. Our root spec has no # sources. - s.ios.deployment_target = '11.0' - s.osx.deployment_target = '10.13' - s.watchos.deployment_target = '4.0' - s.tvos.deployment_target = '11.0' + s.ios.deployment_target = '8.0' + s.osx.deployment_target = '10.10' + s.watchos.deployment_target = '2.0' + s.tvos.deployment_target = '9.0' s.pod_target_xcconfig = { 'OTHER_SWIFT_FLAGS' => '-DPMKCocoaPods', @@ -38,8 +38,8 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/Accounts/Sources/*.plist' ss.ios.frameworks = ss.osx.frameworks = 'Accounts' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '11.0' - ss.osx.deployment_target = '10.13' + ss.ios.deployment_target = '8.0' + ss.osx.deployment_target = '10.10' end s.subspec 'Alamofire' do |ss| @@ -47,10 +47,10 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/Alamofire/Sources/*.plist' ss.dependency 'Alamofire', '~> 4.0' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' ss.osx.deployment_target = '10.11' - ss.watchos.deployment_target = '4.0' - ss.tvos.deployment_target = '11.0' + ss.watchos.deployment_target = '2.0' + ss.tvos.deployment_target = '9.0' end s.subspec 'AddressBook' do |ss| @@ -58,7 +58,7 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/AddressBook/Sources/*.plist' ss.ios.frameworks = 'AddressBook' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' end s.subspec 'AssetsLibrary' do |ss| @@ -66,7 +66,7 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/AssetsLibrary/Sources/*.plist' ss.ios.frameworks = 'AssetsLibrary' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' end s.subspec 'AVFoundation' do |ss| @@ -74,7 +74,7 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/AVFoundation/Sources/*.plist' ss.ios.frameworks = 'AVFoundation' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' end s.subspec 'Bolts' do |ss| @@ -82,10 +82,10 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/Bolts/Sources/*.plist' ss.dependency 'PromiseKit/CorePromise' ss.dependency 'Bolts', '~> 1.9.0' - ss.ios.deployment_target = '11.0' - ss.osx.deployment_target = '10.13' - ss.watchos.deployment_target = '4.0' - ss.tvos.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' + ss.osx.deployment_target = '10.10' + ss.watchos.deployment_target = '2.0' + ss.tvos.deployment_target = '9.0' end s.subspec 'CloudKit' do |ss| @@ -96,7 +96,7 @@ Pod::Spec.new do |s| ss.ios.deployment_target = '10.0' ss.osx.deployment_target = '10.12' ss.tvos.deployment_target = '10.0' - ss.watchos.deployment_target = '4.0' + ss.watchos.deployment_target = '3.0' end s.subspec 'CoreBluetooth' do |ss| @@ -104,9 +104,9 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/CoreBluetooth/Sources/*.plist' ss.ios.frameworks = ss.osx.frameworks = ss.tvos.frameworks = 'CoreBluetooth' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '11.0' - ss.osx.deployment_target = '10.13' - ss.tvos.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' + ss.osx.deployment_target = '10.10' + ss.tvos.deployment_target = '9.0' end s.subspec 'CorePromise' do |ss| @@ -122,10 +122,10 @@ Pod::Spec.new do |s| ss.preserve_paths = 'Sources/AnyPromise+Private.h', 'Sources/PMKCallVariadicBlock.m', 'Sources/NSMethodSignatureForBlock.m' ss.frameworks = 'Foundation' - ss.ios.deployment_target = '11.0' - ss.osx.deployment_target = '10.13' - ss.watchos.deployment_target = '4.0' - ss.tvos.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' + ss.osx.deployment_target = '10.10' + ss.watchos.deployment_target = '2.0' + ss.tvos.deployment_target = '9.0' end s.subspec 'CoreLocation' do |ss| @@ -135,10 +135,10 @@ Pod::Spec.new do |s| ss.dependency 'PromiseKit/CorePromise' ss.frameworks = 'CoreLocation' - ss.ios.deployment_target = '11.0' - ss.osx.deployment_target = '10.13' - ss.watchos.deployment_target = '4.0' - ss.tvos.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' + ss.osx.deployment_target = '10.10' + ss.watchos.deployment_target = '3.0' + ss.tvos.deployment_target = '9.0' end s.subspec 'EventKit' do |ss| @@ -147,9 +147,9 @@ Pod::Spec.new do |s| ss.ios.frameworks = ss.osx.frameworks = ss.watchos.frameworks = 'EventKit' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '11.0' - ss.osx.deployment_target = '10.13' - ss.watchos.deployment_target = '4.0' + ss.ios.deployment_target = '8.0' + ss.osx.deployment_target = '10.10' + ss.watchos.deployment_target = '2.0' end s.subspec 'Foundation' do |ss| @@ -157,10 +157,10 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/Foundation/Sources/*.plist' ss.dependency 'PromiseKit/CorePromise' ss.frameworks = 'Foundation' - ss.ios.deployment_target = '11.0' - ss.osx.deployment_target = '10.13' - ss.watchos.deployment_target = '4.0' - ss.tvos.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' + ss.osx.deployment_target = '10.10' + ss.watchos.deployment_target = '2.0' + ss.tvos.deployment_target = '9.0' end s.subspec 'HealthKit' do |ss| @@ -169,7 +169,7 @@ Pod::Spec.new do |s| ss.dependency 'PromiseKit/CorePromise' ss.frameworks = 'HealthKit' ss.ios.deployment_target = '9.0' - ss.watchos.deployment_target = '4.0' + ss.watchos.deployment_target = '2.0' end s.subspec 'HomeKit' do |ss| @@ -177,9 +177,9 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/HomeKit/Sources/*.plist' ss.dependency 'PromiseKit/CorePromise' ss.frameworks = 'HomeKit' - ss.ios.deployment_target = '11.0' - ss.watchos.deployment_target = '4.0' - ss.tvos.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' + ss.watchos.deployment_target = '3.0' + ss.tvos.deployment_target = '9.0' end s.subspec 'MapKit' do |ss| @@ -187,9 +187,9 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/MapKit/Sources/*.plist' ss.ios.frameworks = ss.osx.frameworks = ss.tvos.frameworks = 'MapKit' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '11.0' - ss.osx.deployment_target = '10.13' - ss.watchos.deployment_target = '4.0' + ss.ios.deployment_target = '8.0' + ss.osx.deployment_target = '10.10' + ss.watchos.deployment_target = '2.0' ss.tvos.deployment_target = '9.2' end @@ -198,7 +198,7 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/MessagesUI/Sources/*.plist' ss.ios.frameworks = 'MessageUI' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' end s.subspec 'OMGHTTPURLRQ' do |ss| @@ -206,10 +206,10 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/OMGHTTPURLRQ/Sources/*.plist' ss.dependency 'PromiseKit/Foundation' ss.dependency 'OMGHTTPURLRQ', '~> 3.2' - ss.ios.deployment_target = '11.0' - ss.osx.deployment_target = '10.13' - ss.watchos.deployment_target = '4.0' - ss.tvos.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' + ss.osx.deployment_target = '10.10' + ss.watchos.deployment_target = '2.0' + ss.tvos.deployment_target = '9.0' end s.subspec 'Photos' do |ss| @@ -218,7 +218,7 @@ Pod::Spec.new do |s| ss.ios.frameworks = ss.tvos.frameworks = ss.osx.frameworks = 'Photos' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' ss.osx.deployment_target = '10.13' ss.tvos.deployment_target = '10.0' end @@ -228,9 +228,9 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/QuartzCore/Sources/*.plist' ss.osx.frameworks = ss.ios.frameworks = ss.tvos.frameworks = 'QuartzCore' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '11.0' - ss.osx.deployment_target = '10.13' - ss.tvos.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' + ss.osx.deployment_target = '10.10' + ss.tvos.deployment_target = '9.0' end s.subspec 'Social' do |ss| @@ -239,8 +239,8 @@ Pod::Spec.new do |s| ss.osx.source_files = Dir['Extensions/Social/Sources/*'] - ['Categories/Social/Sources/*SLComposeViewController+Promise.swift'] ss.ios.frameworks = ss.osx.frameworks = 'Social' ss.dependency 'PromiseKit/Foundation' - ss.ios.deployment_target = '11.0' - ss.osx.deployment_target = '10.13' + ss.ios.deployment_target = '8.0' + ss.osx.deployment_target = '10.10' end s.subspec 'StoreKit' do |ss| @@ -248,9 +248,9 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/StoreKit/Sources/*.plist' ss.ios.frameworks = ss.osx.frameworks = ss.tvos.frameworks = 'StoreKit' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '11.0' - ss.osx.deployment_target = '10.13' - ss.tvos.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' + ss.osx.deployment_target = '10.10' + ss.tvos.deployment_target = '9.0' end s.subspec 'SystemConfiguration' do |ss| @@ -258,9 +258,9 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/SystemConfiguration/Sources/*.plist' ss.ios.frameworks = ss.osx.frameworks = ss.tvos.frameworks = 'SystemConfiguration' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '11.0' - ss.osx.deployment_target = '10.13' - ss.tvos.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' + ss.osx.deployment_target = '10.10' + ss.tvos.deployment_target = '9.0' end picker_cc = 'Extensions/UIKit/Sources/UIImagePickerController+Promise.swift' @@ -270,8 +270,8 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/UIKit/Sources/*.plist' ss.tvos.frameworks = ss.ios.frameworks = 'UIKit' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '11.0' - ss.tvos.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' + ss.tvos.deployment_target = '9.0' end s.subspec 'UIImagePickerController' do |ss| @@ -288,7 +288,7 @@ Pod::Spec.new do |s| ss.ios.frameworks = 'UIKit' ss.ios.xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => '$(inherited) PMKImagePickerController=1' } ss.dependency 'PromiseKit/UIKit' - ss.ios.deployment_target = '11.0' + ss.ios.deployment_target = '8.0' end s.subspec 'WatchConnectivity' do |ss| @@ -296,7 +296,7 @@ Pod::Spec.new do |s| ss.exclude_files = 'Extensions/WatchConnectivity/Sources/*.plist' ss.ios.frameworks = ss.watchos.frameworks = 'WatchConnectivity' ss.dependency 'PromiseKit/CorePromise' - ss.ios.deployment_target = '11.0' - ss.watchos.deployment_target = '4.0' + ss.ios.deployment_target = '8.0' + ss.watchos.deployment_target = '2.0' end end