diff --git a/ios/Podfile b/ios/Podfile index db94313..627a139 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -129,5 +129,22 @@ target 'AlerteSecours' do File.write(crop_toolbar_path, contents) end end + + # Fix CocoaPods xcconfig merge error for expo-dev-menu subspec targets. + # CocoaPods sometimes generates different DEFINES_MODULE values for these targets, + # which breaks `pod install` when it tries to merge xcconfigs. + expo_dev_menu_targets = %w[ + expo-dev-menu + Main + ReactNativeCompatibles + SafeAreaView + Vendored + ] + installer.pods_project.targets.each do |t| + next unless expo_dev_menu_targets.include?(t.name) + t.build_configurations.each do |config| + config.build_settings['DEFINES_MODULE'] = 'YES' + end + end end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index c4dcf45..2c88326 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2178,11 +2178,32 @@ PODS: - React-logger (= 0.79.6) - React-perflogger (= 0.79.6) - React-utils (= 0.79.6) - - RNBackgroundFetch (4.2.8): - - React-Core - - RNBackgroundGeolocation (4.19.0): + - RNBackgroundGeolocation (5.0.1): - CocoaLumberjack (~> 3.8.5) + - DoubleConversion + - glog + - hermes-engine + - RCT-Folly (= 2024.11.18.00) + - RCTRequired + - RCTTypeSafety - React-Core + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-hermes + - React-ImageManager + - React-jsi + - React-NativeModulesApple + - React-RCTFabric + - React-renderercss + - React-rendererdebug + - React-utils + - ReactCodegen + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - TSLocationManager (~> 4.0.0) + - Yoga - RNCAsyncStorage (2.1.2): - React-Core - RNCMaskedView (0.3.2): @@ -2436,6 +2457,9 @@ PODS: - Sentry/HybridSDK (8.50.2) - SocketRocket (0.7.1) - TOCropViewController (2.8.0) + - TSBackgroundFetch (4.0.6) + - TSLocationManager (4.0.9): + - TSBackgroundFetch (~> 4.0.6) - UMAppLoader (5.1.3) - Yoga (0.0.0) @@ -2553,7 +2577,6 @@ DEPENDENCIES: - ReactAppDependencyProvider (from `build/generated/ios`) - ReactCodegen (from `build/generated/ios`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - - RNBackgroundFetch (from `../node_modules/react-native-background-fetch`) - RNBackgroundGeolocation (from `../node_modules/react-native-background-geolocation`) - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)" - "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)" @@ -2589,6 +2612,8 @@ SPEC REPOS: - Sentry - SocketRocket - TOCropViewController + - TSBackgroundFetch + - TSLocationManager EXTERNAL SOURCES: boost: @@ -2814,8 +2839,6 @@ EXTERNAL SOURCES: :path: build/generated/ios ReactCommon: :path: "../node_modules/react-native/ReactCommon" - RNBackgroundFetch: - :path: "../node_modules/react-native-background-fetch" RNBackgroundGeolocation: :path: "../node_modules/react-native-background-geolocation" RNCAsyncStorage: @@ -2972,8 +2995,7 @@ SPEC CHECKSUMS: ReactAppDependencyProvider: ae0be24eb18014a031b4b220cb3973d07c3cbaf8 ReactCodegen: 3d5c9def468f7df3b90b05d3098ab8d47d76c62e ReactCommon: 4c22936ee38ecf885efc95ac5832f430f27e0271 - RNBackgroundFetch: e44c9e85d7fb3122c37d8a806278f62c7682d7ea - RNBackgroundGeolocation: 7e969292ffe21f6d757c2efbbb9cf58acb554dbd + RNBackgroundGeolocation: a1a22b12ae92306d46150b9827cc1421ec03bd18 RNCAsyncStorage: b9f5f78da5d16a853fe3dc22e8268d932fc45a83 RNCMaskedView: 473e5fa854913eff0eef18c09b1328e60b3bf3f7 RNFBApp: 8d27c7545e7e06d78974e204ff95f207a60a5cb2 @@ -2989,9 +3011,11 @@ SPEC CHECKSUMS: Sentry: d95f5f3b32d01324b3e27d3c52747005302cc026 SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 TOCropViewController: 797deaf39c90e6e9ddd848d88817f6b9a8a09888 + TSBackgroundFetch: 0afbeaae4e1132866e1d4b6e55265af26b5958ae + TSLocationManager: ba5648de9d7226abca875a06fbce7f50b3e9acf5 UMAppLoader: 55159b69750129faa7a51c493cb8ea55a7b64eb9 Yoga: b37eeaa6148984cac70ecaf8022bb209e03296cb -PODFILE CHECKSUM: b7512b313bae79574a1156b44cfc5fd6e73aeabf +PODFILE CHECKSUM: 5686979b0aa88a157955165df52d1be990eeb6e7 COCOAPODS: 1.16.2 diff --git a/package.json b/package.json index e7acb0b..b94d4ac 100644 --- a/package.json +++ b/package.json @@ -177,7 +177,6 @@ "react-native": "0.79.6", "react-native-animatable": "^1.3.3", "react-native-app-link": "^1.0.1", - "react-native-background-fetch": "^4.2.8", "react-native-background-geolocation": "5.0.1", "react-native-battery-optimization-check": "^1.0.8", "react-native-contact-pick": "^0.1.2", diff --git a/yarn.lock b/yarn.lock index 19b340b..57d0a6e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7140,7 +7140,6 @@ __metadata: react-native: "npm:0.79.6" react-native-animatable: "npm:^1.3.3" react-native-app-link: "npm:^1.0.1" - react-native-background-fetch: "npm:^4.2.8" react-native-background-geolocation: "npm:5.0.1" react-native-battery-optimization-check: "npm:^1.0.8" react-native-clean-project: "npm:^4.0.3" @@ -16720,13 +16719,6 @@ __metadata: languageName: node linkType: hard -"react-native-background-fetch@npm:^4.2.8": - version: 4.2.8 - resolution: "react-native-background-fetch@npm:4.2.8" - checksum: 10/0950fbc553bca05d424591fbea7ffe534b51068a66497a0cac36aee7341c3aac9ec06932164572753a0a1b8c0c0f5d8d8df01a34b5288c81cdf4db555cf5024d - languageName: node - linkType: hard - "react-native-background-geolocation@npm:5.0.1": version: 5.0.1 resolution: "react-native-background-geolocation@npm:5.0.1"