diff --git a/ios/Podfile b/ios/Podfile index 798e533f56..ada7abaa22 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -29,8 +29,8 @@ target 'JitsiMeetSDK' do # Native pod dependencies # - pod 'CocoaLumberjack', '~>3.5.3' - pod 'ObjectiveDropboxOfficial', '~>6.1.0' + pod 'CocoaLumberjack', '3.7.2' + pod 'ObjectiveDropboxOfficial', '6.2.3' end post_install do |installer| @@ -40,6 +40,7 @@ post_install do |installer| config.build_settings['ENABLE_BITCODE'] = 'YES' config.build_settings['SUPPORTS_MACCATALYST'] = 'NO' config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0' + config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "" end end # https://github.com/facebook/react-native/blob/d7f748a944a9a9324e485ccbe214098e6c8645fc/scripts/react_native_pods.rb#L630 diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 49d1b09ede..0952af869d 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -9,9 +9,9 @@ PODS: - AppAuth/Core (1.4.0) - AppAuth/ExternalUserAgent (1.4.0) - boost (1.76.0) - - CocoaLumberjack (3.5.3): - - CocoaLumberjack/Core (= 3.5.3) - - CocoaLumberjack/Core (3.5.3) + - CocoaLumberjack (3.7.2): + - CocoaLumberjack/Core (= 3.7.2) + - CocoaLumberjack/Core (3.7.2) - DoubleConversion (1.1.6) - FBLazyVector (0.66.4) - FBReactNativeSpec (0.66.4): @@ -107,7 +107,7 @@ PODS: - nanopb/encode (= 1.30906.0) - nanopb/decode (1.30906.0) - nanopb/encode (1.30906.0) - - ObjectiveDropboxOfficial (6.1.0) + - ObjectiveDropboxOfficial (6.2.3) - PromisesObjC (1.2.12) - RCT-Folly (2021.06.28.00-v2): - boost @@ -435,7 +435,7 @@ PODS: DEPENDENCIES: - "amplitude-react-native (from `../node_modules/@amplitude/react-native`)" - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - - CocoaLumberjack (~> 3.5.3) + - CocoaLumberjack (= 3.7.2) - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) @@ -443,7 +443,7 @@ DEPENDENCIES: - Firebase/Crashlytics (~> 6.33.0) - Firebase/DynamicLinks (~> 6.33.0) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - - ObjectiveDropboxOfficial (~> 6.1.0) + - ObjectiveDropboxOfficial (= 6.2.3) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) @@ -639,7 +639,7 @@ SPEC CHECKSUMS: amplitude-react-native: 0ed8cab759aafaa94961b82122bf56297da607ad AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7 boost: a7c83b31436843459a1961bfd74b96033dc77234 - CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947 + CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 FBLazyVector: e5569e42a1c79ca00521846c223173a57aca1fe1 FBReactNativeSpec: fe08c1cd7e2e205718d77ad14b34957cce949b58 @@ -659,7 +659,7 @@ SPEC CHECKSUMS: GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89 GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91 nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc - ObjectiveDropboxOfficial: b4765572e334d6fc6214b43a7595510324bbbbaa + ObjectiveDropboxOfficial: fe206ce8c0bc49976c249d472db7fdbc53ebbd53 PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97 RCT-Folly: a21c126816d8025b547704b777a2ba552f3d9fa9 RCTRequired: 4bf86c70714490bca4bf2696148638284622644b @@ -712,6 +712,6 @@ SPEC CHECKSUMS: RNWatch: 99637948ec9b5c9ec5a41920642594ad5ba07e80 Yoga: e7dc4e71caba6472ff48ad7d234389b91dadc280 -PODFILE CHECKSUM: d2617e38cab565a58af9b0f39cbea50d8af048c0 +PODFILE CHECKSUM: e41212a6ae973769a62da680119065bfc370819c COCOAPODS: 1.11.2 diff --git a/ios/app/app.xcodeproj/project.pbxproj b/ios/app/app.xcodeproj/project.pbxproj index 59be2dc3ea..c0db714fe3 100644 --- a/ios/app/app.xcodeproj/project.pbxproj +++ b/ios/app/app.xcodeproj/project.pbxproj @@ -821,6 +821,7 @@ baseConfigurationReference = 756FCE06C08D9B947653C98A /* Pods-JitsiMeet.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug; CODE_SIGN_ENTITLEMENTS = app.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; @@ -829,6 +830,7 @@ DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = FC967L3QRG; ENABLE_BITCODE = NO; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; INFOPLIST_FILE = src/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -851,6 +853,7 @@ baseConfigurationReference = 3E0F4ED943C0B12BE77F6B45 /* Pods-JitsiMeet.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIconRelease; CODE_SIGN_ENTITLEMENTS = app.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; @@ -858,6 +861,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = FC967L3QRG; ENABLE_BITCODE = YES; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; INFOPLIST_FILE = src/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/ios/sdk/sdk.xcodeproj/project.pbxproj b/ios/sdk/sdk.xcodeproj/project.pbxproj index d07f3a3172..dae4d36de9 100644 --- a/ios/sdk/sdk.xcodeproj/project.pbxproj +++ b/ios/sdk/sdk.xcodeproj/project.pbxproj @@ -606,6 +606,7 @@ baseConfigurationReference = 09A78016288AF50ACD28A10D /* Pods-JitsiMeetSDK.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -634,6 +635,7 @@ baseConfigurationReference = 891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";