Skip to content

Commit e37baa0

Browse files
authored
Merge pull request Expensify#88517 from software-mansion-labs/fix-debug-builds-on-standalone-new-dot
[No QA] Fix standalone NewDot debug builds to use debug compilation flags
2 parents 28afae0 + 8a042e5 commit e37baa0

2 files changed

Lines changed: 17 additions & 41 deletions

File tree

ios/Podfile

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,21 @@ def __apply_Xcode_14_3_RC_post_install_workaround(installer)
4747
end
4848
end
4949

50-
# Pods does not derive :debug type from NewExpensify's debug configurations so we need to set it manually before react-native-post-install.
51-
# Based on this value react-native-post-install will set the correct GCC_PREPROCESSOR_DEFINITIONS e.g. ENABLE_HERMES_DEBUGGER
52-
def __set_debug_type_for_debug_configurations(installer)
53-
installer.pods_project.build_configurations.each do |config|
54-
if config.name.downcase.include?("debug")
55-
installer.pods_project.add_build_configuration(config.name, :debug)
56-
end
57-
end
58-
end
59-
6050
# Configure Mapbox before installing dependencies
6151
pre_install do |installer|
6252
$RNMapboxMaps.pre_install(installer)
6353
end
6454

55+
# Declare project globally so all targets inherit the same build configurations
56+
project 'NewExpensify',
57+
'DebugDevelopment' => :debug,
58+
'DebugAdHoc' => :debug,
59+
'DebugProduction' => :debug,
60+
'ReleaseDevelopment' => :release,
61+
'ReleaseAdHoc' => :release,
62+
'ReleaseProduction' => :release,
63+
'Debug' => :debug
64+
6565
target 'NewExpensify' do
6666
use_expo_modules!
6767
post_integrate do |installer|
@@ -73,15 +73,6 @@ target 'NewExpensify' do
7373
end
7474
permissions_path = '../node_modules/react-native-permissions/ios'
7575

76-
project 'NewExpensify',
77-
'DebugDevelopment' => :debug,
78-
'DebugAdHoc' => :debug,
79-
'DebugProduction' => :debug,
80-
'ReleaseDevelopment' => :release,
81-
'ReleaseAdHoc' => :release,
82-
'ReleaseProduction' => :release,
83-
'Debug' => :debug
84-
8576
config = use_native_modules!(['npx', 'rock', 'config', '-p', 'ios'])
8677

8778
# Flags change depending on the env values.
@@ -103,7 +94,6 @@ target 'NewExpensify' do
10394
# Configure Mapbox after installation
10495
$RNMapboxMaps.post_install(installer)
10596

106-
__set_debug_type_for_debug_configurations(installer)
10797
# https://github.com/facebook/react-native/blob/main/scripts/react_native_pods.rb#L197-L202
10898
react_native_post_install(
10999
installer,

ios/Podfile.lock

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,6 @@ PODS:
508508
- React-jsinspectorcdp
509509
- React-jsitooling
510510
- React-perflogger
511-
- React-rendererconsistency
512511
- React-runtimeexecutor
513512
- React-runtimescheduler
514513
- React-utils
@@ -534,7 +533,6 @@ PODS:
534533
- React-jsinspectorcdp
535534
- React-jsitooling
536535
- React-perflogger
537-
- React-rendererconsistency
538536
- React-runtimeexecutor
539537
- React-runtimescheduler
540538
- React-utils
@@ -559,7 +557,6 @@ PODS:
559557
- React-jsinspectorcdp
560558
- React-jsitooling
561559
- React-perflogger
562-
- React-rendererconsistency
563560
- React-runtimeexecutor
564561
- React-runtimescheduler
565562
- React-utils
@@ -586,7 +583,6 @@ PODS:
586583
- React-jsinspectorcdp
587584
- React-jsitooling
588585
- React-perflogger
589-
- React-rendererconsistency
590586
- React-runtimeexecutor
591587
- React-runtimescheduler
592588
- React-utils
@@ -612,7 +608,6 @@ PODS:
612608
- React-jsinspectorcdp
613609
- React-jsitooling
614610
- React-perflogger
615-
- React-rendererconsistency
616611
- React-runtimeexecutor
617612
- React-runtimescheduler
618613
- React-utils
@@ -638,7 +633,6 @@ PODS:
638633
- React-jsinspectorcdp
639634
- React-jsitooling
640635
- React-perflogger
641-
- React-rendererconsistency
642636
- React-runtimeexecutor
643637
- React-runtimescheduler
644638
- React-utils
@@ -664,7 +658,6 @@ PODS:
664658
- React-jsinspectorcdp
665659
- React-jsitooling
666660
- React-perflogger
667-
- React-rendererconsistency
668661
- React-runtimeexecutor
669662
- React-runtimescheduler
670663
- React-utils
@@ -690,7 +683,6 @@ PODS:
690683
- React-jsinspectorcdp
691684
- React-jsitooling
692685
- React-perflogger
693-
- React-rendererconsistency
694686
- React-runtimeexecutor
695687
- React-runtimescheduler
696688
- React-utils
@@ -716,7 +708,6 @@ PODS:
716708
- React-jsinspectorcdp
717709
- React-jsitooling
718710
- React-perflogger
719-
- React-rendererconsistency
720711
- React-runtimeexecutor
721712
- React-runtimescheduler
722713
- React-utils
@@ -742,7 +733,6 @@ PODS:
742733
- React-jsinspectorcdp
743734
- React-jsitooling
744735
- React-perflogger
745-
- React-rendererconsistency
746736
- React-runtimeexecutor
747737
- React-runtimescheduler
748738
- React-utils
@@ -768,7 +758,6 @@ PODS:
768758
- React-jsinspectorcdp
769759
- React-jsitooling
770760
- React-perflogger
771-
- React-rendererconsistency
772761
- React-runtimeexecutor
773762
- React-runtimescheduler
774763
- React-utils
@@ -794,7 +783,6 @@ PODS:
794783
- React-jsinspectorcdp
795784
- React-jsitooling
796785
- React-perflogger
797-
- React-rendererconsistency
798786
- React-runtimeexecutor
799787
- React-runtimescheduler
800788
- React-utils
@@ -820,7 +808,6 @@ PODS:
820808
- React-jsinspectorcdp
821809
- React-jsitooling
822810
- React-perflogger
823-
- React-rendererconsistency
824811
- React-runtimeexecutor
825812
- React-runtimescheduler
826813
- React-utils
@@ -846,7 +833,6 @@ PODS:
846833
- React-jsinspectorcdp
847834
- React-jsitooling
848835
- React-perflogger
849-
- React-rendererconsistency
850836
- React-runtimeexecutor
851837
- React-runtimescheduler
852838
- React-utils
@@ -4300,7 +4286,7 @@ DEPENDENCIES:
43004286
- fast_float (from `../node_modules/react-native/third-party-podspecs/fast_float.podspec`)
43014287
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
43024288
- fmt (from `../node_modules/react-native/third-party-podspecs/fmt.podspec`)
4303-
- "FullStory (from `{:http=>\"https://ios-releases.fullstory.com/fullstory-1.68.3-xcframework.tar.gz\"}`)"
4289+
- "FullStory (from `{http: \"https://ios-releases.fullstory.com/fullstory-1.68.3-xcframework.tar.gz\"}`)"
43044290
- "fullstory_react-native (from `../node_modules/@fullstory/react-native`)"
43054291
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
43064292
- group-ib-fp (from `../node_modules/group-ib-fp`)
@@ -4782,7 +4768,7 @@ SPEC CHECKSUMS:
47824768
AirshipServiceExtension: 50d11b2f62c4a490d4e81a1c36f70e2ecb70a27e
47834769
AppAuth: d4f13a8fe0baf391b2108511793e4b479691fb73
47844770
AppLogs: 3bc4e9b141dbf265b9464409caaa40416a9ee0e0
4785-
boost: 659a89341ea4ab3df8259733813b52f26d8be9a5
4771+
boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
47864772
DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
47874773
EXConstants: b3c63be5f8648e4ab8e6ff5099b62f629247f969
47884774
expensify-react-native-background-task: 03c640e1f5649692d058cba48c0a138f024a6dd3
@@ -4821,7 +4807,7 @@ SPEC CHECKSUMS:
48214807
GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de
48224808
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
48234809
GzipSwift: 893f3e48e597a1a4f62fafcb6514220fcf8287fa
4824-
hermes-engine: 9a70f3f40c414a11a2dd422ce023c7674a87cdfb
4810+
hermes-engine: b39ec807040f5a775de027a4a9647c0f4222c6ef
48254811
libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
48264812
libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f
48274813
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
@@ -4848,7 +4834,7 @@ SPEC CHECKSUMS:
48484834
RCTTypeSafety: 27927d0ca04e419ed9467578b3e6297e37210b5c
48494835
React: 4bc1f928568ad4bcfd147260f907b4ea5873a03b
48504836
React-callinvoker: 87f8728235a0dc62e9dc19b3851c829d9347d015
4851-
React-Core: 176a81025968530159589ec4a67fe2962909fce9
4837+
React-Core: 76bed73b02821e5630e7f2cb2e82432ee964695d
48524838
React-CoreModules: 752dbfdaeb096658aa0adc4a03ba6214815a08df
48534839
React-cxxreact: b6798528aa601c6db66e6adc7e2da2b059c8be74
48544840
React-debug: b2c9f60a9b7a81cefd737cb61e31c2bc39fdfe17
@@ -4900,7 +4886,7 @@ SPEC CHECKSUMS:
49004886
React-NativeModulesApple: e554252d69442010807867cc7d70c0008048ad20
49014887
React-networking: 669cb54cc7e5b65d7dafeeb36970a1421adc8bb3
49024888
React-oscompat: 80166b66da22e7af7fad94474e9997bd52d4c8c6
4903-
React-perflogger: decbf4d10c1f77d687af1d83a6ba9dc1b23715d6
4889+
React-perflogger: d6797918d2b1031e91a9d8f5e7fdd2c8728fb390
49044890
React-performancecdpmetrics: 7706707d5dd49d708518a91abe456dcb585a5865
49054891
React-performancetimeline: c9807b559901c4298a92f6bcb069f49f518b7020
49064892
React-RCTActionSheet: 3bd5f5db9f983cf38d51bb9a7a198e2ebea94821
@@ -4916,7 +4902,7 @@ SPEC CHECKSUMS:
49164902
React-RCTSettings: 2c45623d6c0f30851a123f621eb9d32298bcbb0c
49174903
React-RCTText: 0ee70f5dc18004b4d81b2c214267c6cbec058587
49184904
React-RCTVibration: 88557e21e7cc3fe76b5b174cba28ff45c6def997
4919-
React-rendererconsistency: 5236fe878921773ef9274c44e189e057672ef5bc
4905+
React-rendererconsistency: ac8a9e9ee3eb299458cc848944133ff4be46cc41
49204906
React-renderercss: f04cbe3b06ee071c6ca724f41a3c3aa31332601e
49214907
React-rendererdebug: 2a2e4f7d42abcbec2047e989a1afda5d62905679
49224908
React-RuntimeApple: ce2ae0ea88316a7c708be1e6601e4ec5f6febdce
@@ -4966,6 +4952,6 @@ SPEC CHECKSUMS:
49664952
VisionCamera: 30b358b807324c692064f78385e9a732ce1bebfe
49674953
Yoga: 33b53536a0500d039f2cd78caf1d5d68712d3af7
49684954

4969-
PODFILE CHECKSUM: 66f81d1d8606fb5a02422de6198484f2b557ca22
4955+
PODFILE CHECKSUM: b5c5984c2431ca6aefe88307d041b5640a6661dd
49704956

49714957
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)