From be5720cbbc397f5070425dfef2cb42165668c7d1 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Tue, 30 Apr 2024 14:27:24 -0600 Subject: [PATCH 01/10] Update @rnmapbox/maps to fix iOS warning --- package-lock.json | 7 ++++--- package.json | 2 +- ...box+maps+10.1.11.patch => @rnmapbox+maps+10.1.20.patch} | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) rename patches/{@rnmapbox+maps+10.1.11.patch => @rnmapbox+maps+10.1.20.patch} (98%) diff --git a/package-lock.json b/package-lock.json index 07c49278659e..ca5c142c76b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "@react-navigation/native": "6.1.12", "@react-navigation/stack": "6.3.29", "@react-ng/bounds-observer": "^0.2.1", - "@rnmapbox/maps": "10.1.11", + "@rnmapbox/maps": "10.1.20", "@shopify/flash-list": "1.6.3", "@storybook/addon-a11y": "^8.0.6", "@storybook/addon-essentials": "^8.0.6", @@ -9299,8 +9299,9 @@ } }, "node_modules/@rnmapbox/maps": { - "version": "10.1.11", - "license": "MIT", + "version": "10.1.20", + "resolved": "https://registry.npmjs.org/@rnmapbox/maps/-/maps-10.1.20.tgz", + "integrity": "sha512-NOSQiswgPrBz5u6dCqzCpSdc2Z7ijMvGjQq7i3sA5EDd0fvwB0+wpy1A+YZFP0Ab4hKh/OQFCDqg48S4zT+INg==", "dependencies": { "@turf/along": "6.5.0", "@turf/distance": "6.5.0", diff --git a/package.json b/package.json index 81aea83d66fe..175e8450e83b 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "@react-navigation/native": "6.1.12", "@react-navigation/stack": "6.3.29", "@react-ng/bounds-observer": "^0.2.1", - "@rnmapbox/maps": "10.1.11", + "@rnmapbox/maps": "10.1.20", "@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.20.patch similarity index 98% rename from patches/@rnmapbox+maps+10.1.11.patch rename to patches/@rnmapbox+maps+10.1.20.patch index 5c5b8f0b69bb..78cdc6fc92d4 100644 --- a/patches/@rnmapbox+maps+10.1.11.patch +++ b/patches/@rnmapbox+maps+10.1.20.patch @@ -1,8 +1,8 @@ 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 -index dbd6d0b..1d043f2 100644 +index bf149f9..2d3441b 100644 --- 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 -@@ -188,7 +188,7 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame +@@ -190,7 +190,7 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame private fun setInitialCamera() { mDefaultStop?.let { From f22176c07e890ad9565f026cc12c793b02516cfb Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Wed, 1 May 2024 10:39:23 -0600 Subject: [PATCH 02/10] Add PrivacyInfo file with default react native values --- ios/NewExpensify.xcodeproj/project.pbxproj | 8 ++-- ios/PrivacyInfo.xcprivacy | 43 ++++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 ios/PrivacyInfo.xcprivacy diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index 54486d5bf162..c4b90ee18d61 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -40,7 +40,7 @@ BDB853621F354EBB84E619C2 /* ExpensifyNewKansas-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = D2AFB39EC1D44BF9B91D3227 /* ExpensifyNewKansas-MediumItalic.otf */; }; DD79042B2792E76D004484B4 /* RCTBootSplash.mm in Sources */ = {isa = PBXBuildFile; fileRef = DD79042A2792E76D004484B4 /* RCTBootSplash.mm */; }; DDCB2E57F334C143AC462B43 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D20D83B0E39BA6D21761E72 /* ExpoModulesProvider.swift */; }; - E51DC681C7DEE40AEBDDFBFE /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + E51DC681C7DEE40AEBDDFBFE /* (null) in Frameworks */ = {isa = PBXBuildFile; }; E9DF872D2525201700607FDC /* AirshipConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = E9DF872C2525201700607FDC /* AirshipConfig.plist */; }; ED222ED90E074A5481A854FA /* ExpensifyNeue-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 8B28D84EF339436DBD42A203 /* ExpensifyNeue-BoldItalic.otf */; }; EEAE4F8907465429AA5B5520 /* libPods-NewExpensify.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AEFE6CD54912D427D19133C7 /* libPods-NewExpensify.a */; }; @@ -109,6 +109,7 @@ 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 = ""; }; + 499B0DA92BE2A1C000CABFB0 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 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 = ""; }; @@ -174,9 +175,9 @@ buildActionMask = 2147483647; files = ( 383643682B6D4AE2005BB9AE /* DeviceCheck.framework in Frameworks */, - E51DC681C7DEE40AEBDDFBFE /* BuildFile in Frameworks */, + E51DC681C7DEE40AEBDDFBFE /* (null) in Frameworks */, 976CCB5F8C921482E6AEAE71 /* libPods-NewExpensify.a in Frameworks */, - E51DC681C7DEE40AEBDDFBFE /* BuildFile in Frameworks */, + E51DC681C7DEE40AEBDDFBFE /* (null) in Frameworks */, EEAE4F8907465429AA5B5520 /* libPods-NewExpensify.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -277,6 +278,7 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( + 499B0DA92BE2A1C000CABFB0 /* PrivacyInfo.xcprivacy */, 374FB8D528A133A7000D84EF /* OriginImageRequestHandler.h */, 374FB8D628A133FE000D84EF /* OriginImageRequestHandler.mm */, F0C450E92705020500FD2970 /* colors.json */, diff --git a/ios/PrivacyInfo.xcprivacy b/ios/PrivacyInfo.xcprivacy new file mode 100644 index 000000000000..9ac8ce562dee --- /dev/null +++ b/ios/PrivacyInfo.xcprivacy @@ -0,0 +1,43 @@ + + + + + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryFileTimestamp + NSPrivacyAccessedAPITypeReasons + + C617.1 + + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + CA92.1 + + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategorySystemBootTime + NSPrivacyAccessedAPITypeReasons + + 35F9.1 + + + + NSPrivacyCollectedDataTypes + + NSPrivacyTracking + + + From a232a25643342806b930a4874cfc991f35b3830c Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Wed, 1 May 2024 10:43:51 -0600 Subject: [PATCH 03/10] Add `NSPrivacyAccessedAPICategoryDiskSpace` for Hermes https://github.com/react-native-community/discussions-and-proposals/discussions/776#discussioncomment-9098470 --- ios/PrivacyInfo.xcprivacy | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ios/PrivacyInfo.xcprivacy b/ios/PrivacyInfo.xcprivacy index 9ac8ce562dee..db7d8b7833b4 100644 --- a/ios/PrivacyInfo.xcprivacy +++ b/ios/PrivacyInfo.xcprivacy @@ -19,6 +19,14 @@ + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryDiskSpace + NSPrivacyAccessedAPITypeReasons + + E174.1 + + + NSPrivacyAccessedAPIType NSPrivacyAccessedAPICategoryUserDefaults NSPrivacyAccessedAPITypeReasons From ab64df2e3fa42b3ace4c7d3e548a3a372020c8c3 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Wed, 1 May 2024 11:05:36 -0600 Subject: [PATCH 04/10] Add mapbox to pods --- ios/NewExpensify.xcodeproj/project.pbxproj | 6 ++-- ios/Podfile.lock | 32 +++++++++++----------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index c4b90ee18d61..4beab37651ef 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -40,7 +40,7 @@ BDB853621F354EBB84E619C2 /* ExpensifyNewKansas-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = D2AFB39EC1D44BF9B91D3227 /* ExpensifyNewKansas-MediumItalic.otf */; }; DD79042B2792E76D004484B4 /* RCTBootSplash.mm in Sources */ = {isa = PBXBuildFile; fileRef = DD79042A2792E76D004484B4 /* RCTBootSplash.mm */; }; DDCB2E57F334C143AC462B43 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D20D83B0E39BA6D21761E72 /* ExpoModulesProvider.swift */; }; - E51DC681C7DEE40AEBDDFBFE /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + E51DC681C7DEE40AEBDDFBFE /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; E9DF872D2525201700607FDC /* AirshipConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = E9DF872C2525201700607FDC /* AirshipConfig.plist */; }; ED222ED90E074A5481A854FA /* ExpensifyNeue-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 8B28D84EF339436DBD42A203 /* ExpensifyNeue-BoldItalic.otf */; }; EEAE4F8907465429AA5B5520 /* libPods-NewExpensify.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AEFE6CD54912D427D19133C7 /* libPods-NewExpensify.a */; }; @@ -175,9 +175,9 @@ buildActionMask = 2147483647; files = ( 383643682B6D4AE2005BB9AE /* DeviceCheck.framework in Frameworks */, - E51DC681C7DEE40AEBDDFBFE /* (null) in Frameworks */, + E51DC681C7DEE40AEBDDFBFE /* BuildFile in Frameworks */, 976CCB5F8C921482E6AEAE71 /* libPods-NewExpensify.a in Frameworks */, - E51DC681C7DEE40AEBDDFBFE /* (null) in Frameworks */, + E51DC681C7DEE40AEBDDFBFE /* BuildFile in Frameworks */, EEAE4F8907465429AA5B5520 /* libPods-NewExpensify.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index d17d73e5eef0..23cdb7377a42 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -247,12 +247,12 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - MapboxCommon (23.9.1) - - MapboxCoreMaps (10.16.6): + - MapboxCommon (23.9.2) + - MapboxCoreMaps (10.17.0): - MapboxCommon (~> 23.9) - - MapboxMaps (10.16.6): - - MapboxCommon (= 23.9.1) - - MapboxCoreMaps (= 10.16.6) + - MapboxMaps (10.17.0): + - MapboxCommon (= 23.9.2) + - MapboxCoreMaps (= 10.17.0) - MapboxMobileEvents (= 1.0.10) - Turf (= 2.7.0) - MapboxMobileEvents (1.0.10) @@ -1872,15 +1872,15 @@ PODS: - Yoga - RNLocalize (2.2.6): - React-Core - - rnmapbox-maps (10.1.11): - - MapboxMaps (~> 10.16.4) + - rnmapbox-maps (10.1.20): + - MapboxMaps (~> 10.17.0) - React - React-Core - - rnmapbox-maps/DynamicLibrary (= 10.1.11) + - rnmapbox-maps/DynamicLibrary (= 10.1.20) - Turf - - rnmapbox-maps/DynamicLibrary (10.1.11): + - rnmapbox-maps/DynamicLibrary (10.1.20): - hermes-engine - - MapboxMaps (~> 10.16.4) + - MapboxMaps (~> 10.17.0) - RCT-Folly - RCTRequired - RCTTypeSafety @@ -2469,9 +2469,9 @@ SPEC CHECKSUMS: libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 lottie-ios: 3d98679b41fa6fd6aff2352b3953dbd3df8a397e lottie-react-native: d0e530160e1a0116ab567343d843033c496d0d97 - MapboxCommon: 20466d839cc43381c44df09d19f7f794b55b9a93 - MapboxCoreMaps: c21f433decbb295874f0c2464e492166db813b56 - MapboxMaps: c3b36646b9038706bbceb5de203bcdd0f411e9d0 + MapboxCommon: 768660d6fca8193529ecf82eb6f5f9ae7a5acdf9 + MapboxCoreMaps: be412ff97b16aa7820922c818115a9a0d8211caa + MapboxMaps: 87ef0003e6db46e45e7a16939f29ae87e38e7ce2 MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6 nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 Onfido: 342cbecd7a4383e98dfe7f9c35e98aaece599062 @@ -2558,7 +2558,7 @@ SPEC CHECKSUMS: RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0 RNLiveMarkdown: bfabd5938e5af5afc1e60e4e34286b17f8308184 RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81 - rnmapbox-maps: 51aee278cc2af8af9298f91a2aad7210739785b4 + rnmapbox-maps: df8fe93dbd251f25022f4023d31bc04160d4d65c RNPermissions: 0b61d30d21acbeafe25baaa47d9bae40a0c65216 RNReactNativeHapticFeedback: 616c35bdec7d20d4c524a7949ca9829c09e35f37 RNReanimated: 51db0fff543694d931bd3b7cab1a3b36bd86c738 @@ -2573,8 +2573,8 @@ SPEC CHECKSUMS: SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2 VisionCamera: 1394a316c7add37e619c48d7aa40b38b954bf055 - Yoga: 64cd2a583ead952b0315d5135bf39e053ae9be70 + Yoga: 1b901a6d6eeba4e8a2e8f308f708691cdb5db312 PODFILE CHECKSUM: a25a81f2b50270f0c0bd0aff2e2ebe4d0b4ec06d -COCOAPODS: 1.13.0 +COCOAPODS: 1.15.2 From b6c1d6187efb0489c05671104e77a7d4d6b4bc88 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Wed, 1 May 2024 15:21:09 -0600 Subject: [PATCH 05/10] Install mapbox 10.1.21 --- package-lock.json | 8 ++++---- package.json | 2 +- ...ox+maps+10.1.20.patch => @rnmapbox+maps+10.1.21.patch} | 8 ++------ 3 files changed, 7 insertions(+), 11 deletions(-) rename patches/{@rnmapbox+maps+10.1.20.patch => @rnmapbox+maps+10.1.21.patch} (92%) diff --git a/package-lock.json b/package-lock.json index ca5c142c76b9..bc2069335a13 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "@react-navigation/native": "6.1.12", "@react-navigation/stack": "6.3.29", "@react-ng/bounds-observer": "^0.2.1", - "@rnmapbox/maps": "10.1.20", + "@rnmapbox/maps": "10.1.21", "@shopify/flash-list": "1.6.3", "@storybook/addon-a11y": "^8.0.6", "@storybook/addon-essentials": "^8.0.6", @@ -9299,9 +9299,9 @@ } }, "node_modules/@rnmapbox/maps": { - "version": "10.1.20", - "resolved": "https://registry.npmjs.org/@rnmapbox/maps/-/maps-10.1.20.tgz", - "integrity": "sha512-NOSQiswgPrBz5u6dCqzCpSdc2Z7ijMvGjQq7i3sA5EDd0fvwB0+wpy1A+YZFP0Ab4hKh/OQFCDqg48S4zT+INg==", + "version": "10.1.21", + "resolved": "https://registry.npmjs.org/@rnmapbox/maps/-/maps-10.1.21.tgz", + "integrity": "sha512-Un2EO+PwF8jFz7fqSkCw9wh3x0CgNXW0Xm4jmUvRDYdNb9MPQMviMjF7SPnBGiHRPBCQHEaox9WlrRSyLmDHbQ==", "dependencies": { "@turf/along": "6.5.0", "@turf/distance": "6.5.0", diff --git a/package.json b/package.json index 175e8450e83b..43faf52b37dd 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "@react-navigation/native": "6.1.12", "@react-navigation/stack": "6.3.29", "@react-ng/bounds-observer": "^0.2.1", - "@rnmapbox/maps": "10.1.20", + "@rnmapbox/maps": "10.1.21", "@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.20.patch b/patches/@rnmapbox+maps+10.1.21.patch similarity index 92% rename from patches/@rnmapbox+maps+10.1.20.patch rename to patches/@rnmapbox+maps+10.1.21.patch index 78cdc6fc92d4..f2c625eef203 100644 --- a/patches/@rnmapbox+maps+10.1.20.patch +++ b/patches/@rnmapbox+maps+10.1.21.patch @@ -1,5 +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 -index bf149f9..2d3441b 100644 +index bf149f9..0f9adc8 100644 --- 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 @@ -12,7 +12,7 @@ index bf149f9..2d3441b 100644 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 +index 1808393..8f85396 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 @@ @@ -121,7 +121,3 @@ index 6fa19e5..54d0ff9 100644 #import #import -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 From 64651541ef5f2577dd8b4352f4fa43326b98b761 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Wed, 1 May 2024 15:36:23 -0600 Subject: [PATCH 06/10] Add latest mapbox in pods --- ios/Podfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 23cdb7377a42..205f8bf199c4 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1872,13 +1872,13 @@ PODS: - Yoga - RNLocalize (2.2.6): - React-Core - - rnmapbox-maps (10.1.20): + - rnmapbox-maps (10.1.21): - MapboxMaps (~> 10.17.0) - React - React-Core - - rnmapbox-maps/DynamicLibrary (= 10.1.20) + - rnmapbox-maps/DynamicLibrary (= 10.1.21) - Turf - - rnmapbox-maps/DynamicLibrary (10.1.20): + - rnmapbox-maps/DynamicLibrary (10.1.21): - hermes-engine - MapboxMaps (~> 10.17.0) - RCT-Folly @@ -2558,7 +2558,7 @@ SPEC CHECKSUMS: RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0 RNLiveMarkdown: bfabd5938e5af5afc1e60e4e34286b17f8308184 RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81 - rnmapbox-maps: df8fe93dbd251f25022f4023d31bc04160d4d65c + rnmapbox-maps: c6828d07c05c58c0dc411a6693973dac33cbcd4c RNPermissions: 0b61d30d21acbeafe25baaa47d9bae40a0c65216 RNReactNativeHapticFeedback: 616c35bdec7d20d4c524a7949ca9829c09e35f37 RNReanimated: 51db0fff543694d931bd3b7cab1a3b36bd86c738 From 05fde8892528d791aa784fba3e7aef633b587463 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Mon, 6 May 2024 12:50:27 -0600 Subject: [PATCH 07/10] Downgrade `@rnmapbox/maps` --- ios/Podfile.lock | 8 ++++---- package-lock.json | 8 ++++---- package.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 205f8bf199c4..23cdb7377a42 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1872,13 +1872,13 @@ PODS: - Yoga - RNLocalize (2.2.6): - React-Core - - rnmapbox-maps (10.1.21): + - rnmapbox-maps (10.1.20): - MapboxMaps (~> 10.17.0) - React - React-Core - - rnmapbox-maps/DynamicLibrary (= 10.1.21) + - rnmapbox-maps/DynamicLibrary (= 10.1.20) - Turf - - rnmapbox-maps/DynamicLibrary (10.1.21): + - rnmapbox-maps/DynamicLibrary (10.1.20): - hermes-engine - MapboxMaps (~> 10.17.0) - RCT-Folly @@ -2558,7 +2558,7 @@ SPEC CHECKSUMS: RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0 RNLiveMarkdown: bfabd5938e5af5afc1e60e4e34286b17f8308184 RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81 - rnmapbox-maps: c6828d07c05c58c0dc411a6693973dac33cbcd4c + rnmapbox-maps: df8fe93dbd251f25022f4023d31bc04160d4d65c RNPermissions: 0b61d30d21acbeafe25baaa47d9bae40a0c65216 RNReactNativeHapticFeedback: 616c35bdec7d20d4c524a7949ca9829c09e35f37 RNReanimated: 51db0fff543694d931bd3b7cab1a3b36bd86c738 diff --git a/package-lock.json b/package-lock.json index bc2069335a13..ca5c142c76b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "@react-navigation/native": "6.1.12", "@react-navigation/stack": "6.3.29", "@react-ng/bounds-observer": "^0.2.1", - "@rnmapbox/maps": "10.1.21", + "@rnmapbox/maps": "10.1.20", "@shopify/flash-list": "1.6.3", "@storybook/addon-a11y": "^8.0.6", "@storybook/addon-essentials": "^8.0.6", @@ -9299,9 +9299,9 @@ } }, "node_modules/@rnmapbox/maps": { - "version": "10.1.21", - "resolved": "https://registry.npmjs.org/@rnmapbox/maps/-/maps-10.1.21.tgz", - "integrity": "sha512-Un2EO+PwF8jFz7fqSkCw9wh3x0CgNXW0Xm4jmUvRDYdNb9MPQMviMjF7SPnBGiHRPBCQHEaox9WlrRSyLmDHbQ==", + "version": "10.1.20", + "resolved": "https://registry.npmjs.org/@rnmapbox/maps/-/maps-10.1.20.tgz", + "integrity": "sha512-NOSQiswgPrBz5u6dCqzCpSdc2Z7ijMvGjQq7i3sA5EDd0fvwB0+wpy1A+YZFP0Ab4hKh/OQFCDqg48S4zT+INg==", "dependencies": { "@turf/along": "6.5.0", "@turf/distance": "6.5.0", diff --git a/package.json b/package.json index 43faf52b37dd..175e8450e83b 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "@react-navigation/native": "6.1.12", "@react-navigation/stack": "6.3.29", "@react-ng/bounds-observer": "^0.2.1", - "@rnmapbox/maps": "10.1.21", + "@rnmapbox/maps": "10.1.20", "@shopify/flash-list": "1.6.3", "@storybook/addon-a11y": "^8.0.6", "@storybook/addon-essentials": "^8.0.6", From 55cc04b3cb6d2ae8b0c2716527a81d9af7b8bb51 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Mon, 6 May 2024 15:59:22 -0600 Subject: [PATCH 08/10] Add https://github.com/rnmapbox/maps/pull/3467 to patch --- ....21.patch => @rnmapbox+maps+10.1.20.patch} | 136 +++++++++++++++++- 1 file changed, 134 insertions(+), 2 deletions(-) rename patches/{@rnmapbox+maps+10.1.21.patch => @rnmapbox+maps+10.1.20.patch} (51%) diff --git a/patches/@rnmapbox+maps+10.1.21.patch b/patches/@rnmapbox+maps+10.1.20.patch similarity index 51% rename from patches/@rnmapbox+maps+10.1.21.patch rename to patches/@rnmapbox+maps+10.1.20.patch index f2c625eef203..4257e0417904 100644 --- a/patches/@rnmapbox+maps+10.1.21.patch +++ b/patches/@rnmapbox+maps+10.1.20.patch @@ -1,5 +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 -index bf149f9..0f9adc8 100644 +index bf149f9..2d3441b 100644 --- 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 @@ -12,7 +12,7 @@ index bf149f9..0f9adc8 100644 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..8f85396 100644 +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 @@ @@ -121,3 +121,135 @@ index 6fa19e5..54d0ff9 100644 #import #import +diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.mm b/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.mm +new file mode 100644 +index 0000000..d8a96a4 +--- /dev/null ++++ b/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.mm +@@ -0,0 +1,64 @@ ++#import ++#import ++ ++#import ++#import ++#import ++ ++#import "rnmapbox_maps-Swift.pre.h" ++ ++#ifdef RCT_NEW_ARCH_ENABLED ++#import "rnmapbox_maps_specs.h" ++#else ++#import ++#endif ++ ++@interface RNMBXChangeLineOffsetsShapeAnimatorModule: NSObject ++#ifdef RCT_NEW_ARCH_ENABLED ++ ++#else ++ ++#endif ++@end ++ ++@implementation RNMBXChangeLineOffsetsShapeAnimatorModule ++ ++RCT_EXPORT_MODULE(); ++ ++#ifdef RCT_NEW_ARCH_ENABLED ++@synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED; ++#endif // RCT_NEW_ARCH_ENABLED ++@synthesize bridge = _bridge; ++ ++- (dispatch_queue_t)methodQueue { ++ // It seems that due to how UIBlocks work with uiManager, we need to call the methods there ++ // for the blocks to be dispatched before the batch is completed ++ return RCTGetUIManagerQueue(); ++} ++ ++RCT_EXPORT_METHOD(create:(nonnull NSNumber*)tag lineString: (nonnull NSArray*)coordinates startOffset: (nonnull NSNumber*)startOffset endOffset: (nonnull NSNumber*)endOffset resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { ++ resolve([[ChangeLineOffsetsShapeAnimator createWithTag:tag coordinates:coordinates startOffset:startOffset endOffset:endOffset] getTag]); ++} ++ ++RCT_EXPORT_METHOD(setLineString:(nonnull NSNumber*)tag coordinates: (nonnull NSArray*)coordinates startOffset: (nonnull NSNumber*)startOffset endOffset: (nonnull NSNumber*)endOffset resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { ++ [ChangeLineOffsetsShapeAnimator setLineStringWithTag:tag coordinates:coordinates startOffset:startOffset endOffset:endOffset resolve:resolve reject:reject]; ++} ++ ++RCT_EXPORT_METHOD(setStartOffset:(nonnull NSNumber*)tag offset: (nonnull NSNumber*)offset durationMs: (nonnull NSNumber*)durationMs resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { ++ [ChangeLineOffsetsShapeAnimator setStartOffsetWithTag:tag offset:offset durationMs:durationMs resolve:resolve reject:reject]; ++} ++ ++RCT_EXPORT_METHOD(setEndOffset:(nonnull NSNumber*)tag offset: (nonnull NSNumber*)offset durationMs: (nonnull NSNumber*)durationMs resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { ++ [ChangeLineOffsetsShapeAnimator setEndOffsetWithTag:tag offset:offset durationMs:durationMs resolve:resolve reject:reject]; ++} ++ ++// Thanks to this guard, we won't compile this code when we build for the old architecture. ++#ifdef RCT_NEW_ARCH_ENABLED ++- (std::shared_ptr)getTurboModule: ++ (const facebook::react::ObjCTurboModule::InitParams &)params ++{ ++ return std::make_shared(params); ++} ++#endif // RCT_NEW_ARCH_ENABLED ++ ++@end +diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.mm b/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.mm +new file mode 100644 +index 0000000..4f2f01a +--- /dev/null ++++ b/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.mm +@@ -0,0 +1,56 @@ ++#import ++#import ++ ++#import ++#import ++#import ++ ++#import "rnmapbox_maps-Swift.pre.h" ++ ++#ifdef RCT_NEW_ARCH_ENABLED ++#import "rnmapbox_maps_specs.h" ++#else ++#import ++#endif ++ ++@interface RNMBXMovePointShapeAnimatorModule: NSObject ++#ifdef RCT_NEW_ARCH_ENABLED ++ ++#else ++ ++#endif ++@end ++ ++@implementation RNMBXMovePointShapeAnimatorModule ++ ++RCT_EXPORT_MODULE(); ++ ++#ifdef RCT_NEW_ARCH_ENABLED ++@synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED; ++#endif // RCT_NEW_ARCH_ENABLED ++@synthesize bridge = _bridge; ++ ++- (dispatch_queue_t)methodQueue { ++ // It seems that due to how UIBlocks work with uiManager, we need to call the methods there ++ // for the blocks to be dispatched before the batch is completed ++ return RCTGetUIManagerQueue(); ++} ++ ++RCT_EXPORT_METHOD(create:(nonnull NSNumber*)tag startCoordinate: (nonnull NSArray*)startCoordinate resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { ++ resolve([[MovePointShapeAnimator createWithTag:tag startCoordinate:startCoordinate] getTag]); ++} ++ ++RCT_EXPORT_METHOD(moveTo:(nonnull NSNumber*)tag coordinate: (nonnull NSArray*)coordinate durationMs: (nonnull NSNumber*)durationMs resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { ++ [MovePointShapeAnimator moveToTag:tag coordinate:coordinate durationMs:durationMs resolve:resolve reject:reject]; ++} ++ ++// Thanks to this guard, we won't compile this code when we build for the old architecture. ++#ifdef RCT_NEW_ARCH_ENABLED ++- (std::shared_ptr)getTurboModule: ++ (const facebook::react::ObjCTurboModule::InitParams &)params ++{ ++ return std::make_shared(params); ++} ++#endif // RCT_NEW_ARCH_ENABLED ++ ++@end From 1bc695b8a76b5b2248676f93f3b484bea65ac92a Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Mon, 6 May 2024 16:13:53 -0600 Subject: [PATCH 09/10] Try another patch (rename) --- patches/@rnmapbox+maps+10.1.20.patch | 140 ++------------------------- 1 file changed, 8 insertions(+), 132 deletions(-) diff --git a/patches/@rnmapbox+maps+10.1.20.patch b/patches/@rnmapbox+maps+10.1.20.patch index 4257e0417904..7f5150cab26e 100644 --- a/patches/@rnmapbox+maps+10.1.20.patch +++ b/patches/@rnmapbox+maps+10.1.20.patch @@ -121,135 +121,11 @@ index 6fa19e5..54d0ff9 100644 #import #import -diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.mm b/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.mm -new file mode 100644 -index 0000000..d8a96a4 ---- /dev/null -+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.mm -@@ -0,0 +1,64 @@ -+#import -+#import -+ -+#import -+#import -+#import -+ -+#import "rnmapbox_maps-Swift.pre.h" -+ -+#ifdef RCT_NEW_ARCH_ENABLED -+#import "rnmapbox_maps_specs.h" -+#else -+#import -+#endif -+ -+@interface RNMBXChangeLineOffsetsShapeAnimatorModule: NSObject -+#ifdef RCT_NEW_ARCH_ENABLED -+ -+#else -+ -+#endif -+@end -+ -+@implementation RNMBXChangeLineOffsetsShapeAnimatorModule -+ -+RCT_EXPORT_MODULE(); -+ -+#ifdef RCT_NEW_ARCH_ENABLED -+@synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED; -+#endif // RCT_NEW_ARCH_ENABLED -+@synthesize bridge = _bridge; -+ -+- (dispatch_queue_t)methodQueue { -+ // It seems that due to how UIBlocks work with uiManager, we need to call the methods there -+ // for the blocks to be dispatched before the batch is completed -+ return RCTGetUIManagerQueue(); -+} -+ -+RCT_EXPORT_METHOD(create:(nonnull NSNumber*)tag lineString: (nonnull NSArray*)coordinates startOffset: (nonnull NSNumber*)startOffset endOffset: (nonnull NSNumber*)endOffset resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { -+ resolve([[ChangeLineOffsetsShapeAnimator createWithTag:tag coordinates:coordinates startOffset:startOffset endOffset:endOffset] getTag]); -+} -+ -+RCT_EXPORT_METHOD(setLineString:(nonnull NSNumber*)tag coordinates: (nonnull NSArray*)coordinates startOffset: (nonnull NSNumber*)startOffset endOffset: (nonnull NSNumber*)endOffset resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { -+ [ChangeLineOffsetsShapeAnimator setLineStringWithTag:tag coordinates:coordinates startOffset:startOffset endOffset:endOffset resolve:resolve reject:reject]; -+} -+ -+RCT_EXPORT_METHOD(setStartOffset:(nonnull NSNumber*)tag offset: (nonnull NSNumber*)offset durationMs: (nonnull NSNumber*)durationMs resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { -+ [ChangeLineOffsetsShapeAnimator setStartOffsetWithTag:tag offset:offset durationMs:durationMs resolve:resolve reject:reject]; -+} -+ -+RCT_EXPORT_METHOD(setEndOffset:(nonnull NSNumber*)tag offset: (nonnull NSNumber*)offset durationMs: (nonnull NSNumber*)durationMs resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { -+ [ChangeLineOffsetsShapeAnimator setEndOffsetWithTag:tag offset:offset durationMs:durationMs resolve:resolve reject:reject]; -+} -+ -+// Thanks to this guard, we won't compile this code when we build for the old architecture. -+#ifdef RCT_NEW_ARCH_ENABLED -+- (std::shared_ptr)getTurboModule: -+ (const facebook::react::ObjCTurboModule::InitParams &)params -+{ -+ return std::make_shared(params); -+} -+#endif // RCT_NEW_ARCH_ENABLED -+ -+@end -diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.mm b/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.mm -new file mode 100644 -index 0000000..4f2f01a ---- /dev/null -+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.mm -@@ -0,0 +1,56 @@ -+#import -+#import -+ -+#import -+#import -+#import -+ -+#import "rnmapbox_maps-Swift.pre.h" -+ -+#ifdef RCT_NEW_ARCH_ENABLED -+#import "rnmapbox_maps_specs.h" -+#else -+#import -+#endif -+ -+@interface RNMBXMovePointShapeAnimatorModule: NSObject -+#ifdef RCT_NEW_ARCH_ENABLED -+ -+#else -+ -+#endif -+@end -+ -+@implementation RNMBXMovePointShapeAnimatorModule -+ -+RCT_EXPORT_MODULE(); -+ -+#ifdef RCT_NEW_ARCH_ENABLED -+@synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED; -+#endif // RCT_NEW_ARCH_ENABLED -+@synthesize bridge = _bridge; -+ -+- (dispatch_queue_t)methodQueue { -+ // It seems that due to how UIBlocks work with uiManager, we need to call the methods there -+ // for the blocks to be dispatched before the batch is completed -+ return RCTGetUIManagerQueue(); -+} -+ -+RCT_EXPORT_METHOD(create:(nonnull NSNumber*)tag startCoordinate: (nonnull NSArray*)startCoordinate resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { -+ resolve([[MovePointShapeAnimator createWithTag:tag startCoordinate:startCoordinate] getTag]); -+} -+ -+RCT_EXPORT_METHOD(moveTo:(nonnull NSNumber*)tag coordinate: (nonnull NSArray*)coordinate durationMs: (nonnull NSNumber*)durationMs resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) { -+ [MovePointShapeAnimator moveToTag:tag coordinate:coordinate durationMs:durationMs resolve:resolve reject:reject]; -+} -+ -+// Thanks to this guard, we won't compile this code when we build for the old architecture. -+#ifdef RCT_NEW_ARCH_ENABLED -+- (std::shared_ptr)getTurboModule: -+ (const facebook::react::ObjCTurboModule::InitParams &)params -+{ -+ return std::make_shared(params); -+} -+#endif // RCT_NEW_ARCH_ENABLED -+ -+@end +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 From 41d3c37743e15e77eba335abdbea50cb1738cb65 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Mon, 6 May 2024 17:16:00 -0600 Subject: [PATCH 10/10] Update NewExpensify.xcodeproj/project.pbxproj --- ios/NewExpensify.xcodeproj/project.pbxproj | 38 ++++------------------ 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index dd37770063ef..94118eb3bfa4 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -106,9 +106,9 @@ 3F17376D588832EE0C4E7E13 /* Pods-NewExpensify-NewExpensifyTests.debugproduction.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debugproduction.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debugproduction.xcconfig"; sourceTree = ""; }; 417E30386DDC804B3693037A /* Pods-NewExpensify.releaseproduction.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.releaseproduction.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.releaseproduction.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 = ""; }; - 499B0DA92BE2A1C000CABFB0 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 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 = ""; }; 4D20D83B0E39BA6D21761E72 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-NewExpensify/ExpoModulesProvider.swift"; 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 = ""; }; @@ -1557,11 +1557,7 @@ "$(inherited)", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-Wl", - "-ld_classic", - ); + OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = ""; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; @@ -1629,11 +1625,7 @@ "$(inherited)", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-Wl", - "-ld_classic", - ); + OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = ""; PRODUCT_NAME = ""; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; @@ -1711,11 +1703,7 @@ "$(inherited)", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-Wl", - "-ld_classic", - ); + OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = ""; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; @@ -1860,11 +1848,7 @@ "$(inherited)", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-Wl", - "-ld_classic", - ); + OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = ""; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; @@ -2001,11 +1985,7 @@ "$(inherited)", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-Wl", - "-ld_classic", - ); + OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = ""; PRODUCT_NAME = ""; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; @@ -2140,11 +2120,7 @@ "$(inherited)", "-DRN_FABRIC_ENABLED", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-Wl", - "-ld_classic", - ); + OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = ""; PRODUCT_NAME = ""; REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";