diff --git a/ios/Podfile b/ios/Podfile index 7001cc48d5..798e533f56 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -41,12 +41,8 @@ post_install do |installer| config.build_settings['SUPPORTS_MACCATALYST'] = 'NO' config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0' end - # https://github.com/facebook/react-native/issues/32351#issuecomment-939157955 - case target.name - when 'RCT-Folly' - target.build_configurations.each do |config| - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0' - end - end end + # https://github.com/facebook/react-native/blob/d7f748a944a9a9324e485ccbe214098e6c8645fc/scripts/react_native_pods.rb#L630 + time_header = "#{Pod::Config.instance.installation_root.to_s}/Pods/RCT-Folly/folly/portability/Time.h" + `sed -i -e $'s/ && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_10_0)//' #{time_header}` end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index a32ab5a85a..49d1b09ede 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -712,6 +712,6 @@ SPEC CHECKSUMS: RNWatch: 99637948ec9b5c9ec5a41920642594ad5ba07e80 Yoga: e7dc4e71caba6472ff48ad7d234389b91dadc280 -PODFILE CHECKSUM: 93620e428bb16cc7fb8fd7314c0402e26929b5bf +PODFILE CHECKSUM: d2617e38cab565a58af9b0f39cbea50d8af048c0 COCOAPODS: 1.11.2 diff --git a/ios/sdk/sdk.xcodeproj/project.pbxproj b/ios/sdk/sdk.xcodeproj/project.pbxproj index bcc76e74cf..d07f3a3172 100644 --- a/ios/sdk/sdk.xcodeproj/project.pbxproj +++ b/ios/sdk/sdk.xcodeproj/project.pbxproj @@ -615,6 +615,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = NO; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; INFOPLIST_FILE = src/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios; @@ -642,6 +643,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = YES; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; INFOPLIST_FILE = src/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = org.jitsi.JitsiMeetSDK.ios;