From 3be7cc1a181446dbed7377c3baa21a035cf78f16 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Mon, 6 May 2024 17:43:26 -0600 Subject: [PATCH] Fix merge conflicts --- ios/NewExpensify.xcodeproj/project.pbxproj | 3 - ios/Podfile.lock | 14 --- package.json | 4 - patches/@rnmapbox+maps+10.1.11.patch | 135 --------------------- patches/@rnmapbox+maps+10.1.20.patch | 4 - 5 files changed, 160 deletions(-) delete mode 100644 patches/@rnmapbox+maps+10.1.11.patch diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index c627354b524a..3f9688ef61f2 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -109,13 +109,10 @@ 383643672B6D4AE2005BB9AE /* DeviceCheck.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DeviceCheck.framework; path = System/Library/Frameworks/DeviceCheck.framework; sourceTree = SDKROOT; }; 3BBA44B891E03FAB8255E6F1 /* Pods-NewExpensify-NewExpensifyTests.debugdevelopment.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debugdevelopment.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debugdevelopment.xcconfig"; sourceTree = ""; }; 44BF435285B94E5B95F90994 /* ExpensifyNewKansas-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNewKansas-Medium.otf"; path = "../assets/fonts/native/ExpensifyNewKansas-Medium.otf"; sourceTree = ""; }; -<<<<<<< HEAD -======= 46B1FE4DE317D30C25A74C15 /* Pods-NewExpensify.debugdevelopment.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debugdevelopment.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debugdevelopment.xcconfig"; sourceTree = ""; }; 48E7775E0D42D3E3F53A5B99 /* Pods-NotificationServiceExtension.releaseadhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationServiceExtension.releaseadhoc.xcconfig"; path = "Target Support Files/Pods-NotificationServiceExtension/Pods-NotificationServiceExtension.releaseadhoc.xcconfig"; sourceTree = ""; }; 499B0DA92BE2A1C000CABFB0 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 4A39BBFB1A6AA6A0EB08878C /* Pods-NotificationServiceExtension.debugproduction.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationServiceExtension.debugproduction.xcconfig"; path = "Target Support Files/Pods-NotificationServiceExtension/Pods-NotificationServiceExtension.debugproduction.xcconfig"; sourceTree = ""; }; ->>>>>>> b6cde68 (Merge pull request #41360 from Expensify/andrew-ios-privacy) 4D20D83B0E39BA6D21761E72 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-NewExpensify/ExpoModulesProvider.swift"; sourceTree = ""; }; 4E9593A0EE1C84B8A8EC062F /* Pods-NewExpensify-NewExpensifyTests.debugadhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debugadhoc.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debugadhoc.xcconfig"; sourceTree = ""; }; 52796131E6554494B2DDB056 /* ExpensifyNeue-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNeue-Bold.otf"; path = "../assets/fonts/native/ExpensifyNeue-Bold.otf"; sourceTree = ""; }; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 184953a4e3d5..7e632e5c21b0 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1872,15 +1872,6 @@ PODS: - Yoga - RNLocalize (2.2.6): - React-Core -<<<<<<< HEAD - - rnmapbox-maps (10.1.11): - - MapboxMaps (~> 10.16.4) - - React - - React-Core - - rnmapbox-maps/DynamicLibrary (= 10.1.11) - - Turf - - rnmapbox-maps/DynamicLibrary (10.1.11): -======= - rnmapbox-maps (10.1.20): - MapboxMaps (~> 10.17.0) - React @@ -1888,7 +1879,6 @@ PODS: - rnmapbox-maps/DynamicLibrary (= 10.1.20) - Turf - rnmapbox-maps/DynamicLibrary (10.1.20): ->>>>>>> b6cde68 (Merge pull request #41360 from Expensify/andrew-ios-privacy) - hermes-engine - MapboxMaps (~> 10.17.0) - RCT-Folly @@ -2568,11 +2558,7 @@ SPEC CHECKSUMS: RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0 RNLiveMarkdown: bfabd5938e5af5afc1e60e4e34286b17f8308184 RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81 -<<<<<<< HEAD - rnmapbox-maps: 51aee278cc2af8af9298f91a2aad7210739785b4 -======= rnmapbox-maps: df8fe93dbd251f25022f4023d31bc04160d4d65c ->>>>>>> b6cde68 (Merge pull request #41360 from Expensify/andrew-ios-privacy) RNPermissions: 0b61d30d21acbeafe25baaa47d9bae40a0c65216 RNReactNativeHapticFeedback: 616c35bdec7d20d4c524a7949ca9829c09e35f37 RNReanimated: 51db0fff543694d931bd3b7cab1a3b36bd86c738 diff --git a/package.json b/package.json index 224552381d08..de77dc98c36f 100644 --- a/package.json +++ b/package.json @@ -91,11 +91,7 @@ "@react-navigation/native": "6.1.12", "@react-navigation/stack": "6.3.29", "@react-ng/bounds-observer": "^0.2.1", -<<<<<<< HEAD - "@rnmapbox/maps": "10.1.11", -======= "@rnmapbox/maps": "10.1.20", ->>>>>>> b6cde68 (Merge pull request #41360 from Expensify/andrew-ios-privacy) "@shopify/flash-list": "1.6.3", "@storybook/addon-a11y": "^8.0.6", "@storybook/addon-essentials": "^8.0.6", diff --git a/patches/@rnmapbox+maps+10.1.11.patch b/patches/@rnmapbox+maps+10.1.11.patch deleted file mode 100644 index 3663ece064fa..000000000000 --- a/patches/@rnmapbox+maps+10.1.11.patch +++ /dev/null @@ -1,135 +0,0 @@ -diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt -<<<<<<<< HEAD:patches/@rnmapbox+maps+10.1.11.patch -index dbd6d0b..1d043f2 100644 -======== -index bf149f9..2d3441b 100644 ->>>>>>>> b6cde68 (Merge pull request #41360 from Expensify/andrew-ios-privacy):patches/@rnmapbox+maps+10.1.20.patch ---- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt -+++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt -@@ -190,7 +190,7 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame - - private fun setInitialCamera() { - mDefaultStop?.let { -- val mapView = mMapView!! -+ val mapView = mMapView ?: return - val map = mapView.getMapboxMap() - - it.setDuration(0) -diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModule.m b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModule.m -index 1808393..ec00542 100644 ---- a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModule.m -+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModule.m -@@ -1,4 +1,4 @@ --#import "React/RCTBridgeModule.h" -+#import - #import - - @interface RCT_EXTERN_MODULE(RNMBXOfflineModule, RCTEventEmitter) -diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.m b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.m -index 550f67b..76da02d 100644 ---- a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.m -+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.m -@@ -1,4 +1,4 @@ --#import "React/RCTBridgeModule.h" -+#import - #import - - @interface RCT_EXTERN_MODULE(RNMBXOfflineModuleLegacy, RCTEventEmitter) -diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXTileStoreModule.m b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXTileStoreModule.m -index a98e102..e43be8f 100644 ---- a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXTileStoreModule.m -+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXTileStoreModule.m -@@ -1,4 +1,4 @@ --#import "React/RCTBridgeModule.h" -+#import - #import - - @interface RCT_EXTERN_MODULE(RNMBXTileStoreModule, NSObject) -diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCalloutViewManager.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCalloutViewManager.m -index 62205d5..1db2ac4 100644 ---- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCalloutViewManager.m -+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCalloutViewManager.m -@@ -1,4 +1,4 @@ --#import "React/RCTBridgeModule.h" -+#import - #import - #import - -diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCameraViewManager.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCameraViewManager.m -index e23b10c..6a023fa 100644 ---- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCameraViewManager.m -+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCameraViewManager.m -@@ -1,4 +1,4 @@ --#import "React/RCTBridgeModule.h" -+#import - #import - #import - -diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLocationModule.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLocationModule.m -index 8b89774..9f85c35 100644 ---- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLocationModule.m -+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLocationModule.m -@@ -1,4 +1,4 @@ --#import "React/RCTBridgeModule.h" -+#import - #import - - @class RNMBXLocation; -diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLogging.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLogging.m -index d7c05de..f680b86 100644 ---- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLogging.m -+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLogging.m -@@ -1,4 +1,4 @@ --#import "React/RCTBridgeModule.h" -+#import - - @interface RCT_EXTERN_MODULE(RNMBXLogging, NSObject) - -diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewContentManager.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewContentManager.m -index 72f9928..f4f5fe2 100644 ---- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewContentManager.m -+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewContentManager.m -@@ -1,4 +1,4 @@ --#import "React/RCTBridgeModule.h" -+#import - #import - #import - -diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewManager.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewManager.m -index c0ab14d..6177811 100644 ---- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewManager.m -+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewManager.m -@@ -1,4 +1,4 @@ --#import "React/RCTBridgeModule.h" -+#import - #import - #import - -diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXModule.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXModule.m -index 3b0af79..e00b508 100644 ---- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXModule.m -+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXModule.m -@@ -1,4 +1,4 @@ --#import "React/RCTBridgeModule.h" -+#import - - @interface RCT_EXTERN_MODULE(RNMBXModule, NSObject) - -diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXPointAnnotationViewManager.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXPointAnnotationViewManager.m -index 6fa19e5..54d0ff9 100644 ---- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXPointAnnotationViewManager.m -+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXPointAnnotationViewManager.m -@@ -1,4 +1,4 @@ --#import "React/RCTBridgeModule.h" -+#import - #import - #import - -diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.m b/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.mm -similarity index 100% -rename from node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.m -rename to node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.mm -diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.m b/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.mm -similarity index 100% -rename from node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.m -rename to node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.mm diff --git a/patches/@rnmapbox+maps+10.1.20.patch b/patches/@rnmapbox+maps+10.1.20.patch index 3663ece064fa..91ef182fdd68 100644 --- a/patches/@rnmapbox+maps+10.1.20.patch +++ b/patches/@rnmapbox+maps+10.1.20.patch @@ -1,9 +1,5 @@ diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt -<<<<<<<< HEAD:patches/@rnmapbox+maps+10.1.11.patch -index dbd6d0b..1d043f2 100644 -======== index bf149f9..2d3441b 100644 ->>>>>>>> b6cde68 (Merge pull request #41360 from Expensify/andrew-ios-privacy):patches/@rnmapbox+maps+10.1.20.patch --- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt +++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt @@ -190,7 +190,7 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame