Skip to content

Commit 3f08a49

Browse files
marcaaronmarcaaron
committed
Add flipper performance plugin
Use hermes use number format for iOS too undo changes undo some changes undo flipper stuff undo other changes undo report.js changes
1 parent fd92e19 commit 3f08a49

File tree

4 files changed

+54
-23
lines changed

4 files changed

+54
-23
lines changed

‎ios/ExpensifyCash.xcodeproj/project.pbxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,12 +527,14 @@
527527
);
528528
inputPaths = (
529529
"${PODS_ROOT}/Target Support Files/Pods-ExpensifyCash/Pods-ExpensifyCash-frameworks.sh",
530+
"${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/iphoneos/hermes.framework",
530531
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Onfido/Onfido.framework/Onfido",
531532
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
532533
"${PODS_XCFRAMEWORKS_BUILD_DIR}/LinkKit/LinkKit.framework/LinkKit",
533534
);
534535
name = "[CP] Embed Pods Frameworks";
535536
outputPaths = (
537+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
536538
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Onfido.framework",
537539
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
538540
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LinkKit.framework",
@@ -712,12 +714,14 @@
712714
);
713715
inputPaths = (
714716
"${PODS_ROOT}/Target Support Files/Pods-ExpensifyCash-ExpensifyCashTests/Pods-ExpensifyCash-ExpensifyCashTests-frameworks.sh",
717+
"${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/iphoneos/hermes.framework",
715718
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Onfido/Onfido.framework/Onfido",
716719
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
717720
"${PODS_XCFRAMEWORKS_BUILD_DIR}/LinkKit/LinkKit.framework/LinkKit",
718721
);
719722
name = "[CP] Embed Pods Frameworks";
720723
outputPaths = (
724+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
721725
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Onfido.framework",
722726
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
723727
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LinkKit.framework",
@@ -926,6 +930,7 @@
926930
COPY_PHASE_STRIP = NO;
927931
ENABLE_STRICT_OBJC_MSGSEND = YES;
928932
ENABLE_TESTABILITY = YES;
933+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386";
929934
GCC_C_LANGUAGE_STANDARD = gnu99;
930935
GCC_DYNAMIC_NO_PIC = NO;
931936
GCC_NO_COMMON_BLOCKS = YES;
@@ -986,6 +991,7 @@
986991
COPY_PHASE_STRIP = YES;
987992
ENABLE_NS_ASSERTIONS = NO;
988993
ENABLE_STRICT_OBJC_MSGSEND = YES;
994+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386";
989995
GCC_C_LANGUAGE_STANDARD = gnu99;
990996
GCC_NO_COMMON_BLOCKS = YES;
991997
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

‎ios/Podfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ target 'ExpensifyCash' do
1414
pod 'Permission-LocationWhenInUse', :path => "#{permissions_path}/LocationWhenInUse"
1515

1616
config = use_native_modules!
17-
use_react_native!(:path => config["reactNativePath"])
17+
use_react_native!(
18+
:path => config["reactNativePath"],
19+
:hermes_enabled => true
20+
)
1821

1922
target 'ExpensifyCashTests' do
2023
inherit! :complete
@@ -24,10 +27,11 @@ target 'ExpensifyCash' do
2427
# Enables Flipper.
2528
#
2629
# Note that if you have use_frameworks! enabled, Flipper will not work and
27-
# you should disable these next few lines.
28-
use_flipper!('Flipper' => '0.75.1', 'Flipper-Folly' => '2.5.3', 'Flipper-RSocket' => '1.3.1')
30+
# you should disable the next line.
31+
use_flipper!()
32+
2933
post_install do |installer|
30-
flipper_post_install(installer)
34+
react_native_post_install(installer)
3135

3236
installer.pods_project.build_configurations.each do |config|
3337
config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"

‎ios/Podfile.lock

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ PODS:
177177
- GoogleUtilities/Logger
178178
- GoogleUtilities/UserDefaults (7.5.0):
179179
- GoogleUtilities/Logger
180+
- hermes-engine (0.7.2)
180181
- libevent (2.1.12)
181182
- nanopb (2.30908.0):
182183
- nanopb/decode (= 2.30908.0)
@@ -194,7 +195,7 @@ PODS:
194195
- RNPermissions
195196
- Permission-LocationWhenInUse (3.0.1):
196197
- RNPermissions
197-
- Plaid (2.1.2)
198+
- Plaid (2.1.3)
198199
- PromisesObjC (2.0.0)
199200
- Protobuf (3.17.0)
200201
- RCT-Folly (2020.01.13.00):
@@ -206,6 +207,11 @@ PODS:
206207
- boost-for-react-native
207208
- DoubleConversion
208209
- glog
210+
- RCT-Folly/Futures (2020.01.13.00):
211+
- boost-for-react-native
212+
- DoubleConversion
213+
- glog
214+
- libevent
209215
- RCTRequired (0.64.1)
210216
- RCTTypeSafety (0.64.1):
211217
- FBLazyVector (= 0.64.1)
@@ -263,6 +269,16 @@ PODS:
263269
- React-jsinspector (= 0.64.1)
264270
- React-perflogger (= 0.64.1)
265271
- Yoga
272+
- React-Core/Hermes (0.64.1):
273+
- glog
274+
- hermes-engine
275+
- RCT-Folly (= 2020.01.13.00)
276+
- RCT-Folly/Futures
277+
- React-cxxreact (= 0.64.1)
278+
- React-jsi (= 0.64.1)
279+
- React-jsiexecutor (= 0.64.1)
280+
- React-perflogger (= 0.64.1)
281+
- Yoga
266282
- React-Core/RCTActionSheetHeaders (0.64.1):
267283
- glog
268284
- RCT-Folly (= 2020.01.13.00)
@@ -573,26 +589,28 @@ DEPENDENCIES:
573589
- EXHaptics (from `../node_modules/expo-haptics/ios`)
574590
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
575591
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
576-
- Flipper (= 0.75.1)
592+
- Flipper (~> 0.75.1)
577593
- Flipper-DoubleConversion (= 1.1.7)
578-
- Flipper-Folly (= 2.5.3)
594+
- Flipper-Folly (~> 2.5.3)
579595
- Flipper-Glog (= 0.3.6)
580596
- Flipper-PeerTalk (~> 0.0.4)
581-
- Flipper-RSocket (= 1.3.1)
582-
- FlipperKit (= 0.75.1)
583-
- FlipperKit/Core (= 0.75.1)
584-
- FlipperKit/CppBridge (= 0.75.1)
585-
- FlipperKit/FBCxxFollyDynamicConvert (= 0.75.1)
586-
- FlipperKit/FBDefines (= 0.75.1)
587-
- FlipperKit/FKPortForwarding (= 0.75.1)
588-
- FlipperKit/FlipperKitHighlightOverlay (= 0.75.1)
589-
- FlipperKit/FlipperKitLayoutPlugin (= 0.75.1)
590-
- FlipperKit/FlipperKitLayoutTextSearchable (= 0.75.1)
591-
- FlipperKit/FlipperKitNetworkPlugin (= 0.75.1)
592-
- FlipperKit/FlipperKitReactPlugin (= 0.75.1)
593-
- FlipperKit/FlipperKitUserDefaultsPlugin (= 0.75.1)
594-
- FlipperKit/SKIOSNetworkPlugin (= 0.75.1)
597+
- Flipper-RSocket (~> 1.3)
598+
- FlipperKit (~> 0.75.1)
599+
- FlipperKit/Core (~> 0.75.1)
600+
- FlipperKit/CppBridge (~> 0.75.1)
601+
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.75.1)
602+
- FlipperKit/FBDefines (~> 0.75.1)
603+
- FlipperKit/FKPortForwarding (~> 0.75.1)
604+
- FlipperKit/FlipperKitHighlightOverlay (~> 0.75.1)
605+
- FlipperKit/FlipperKitLayoutPlugin (~> 0.75.1)
606+
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.75.1)
607+
- FlipperKit/FlipperKitNetworkPlugin (~> 0.75.1)
608+
- FlipperKit/FlipperKitReactPlugin (~> 0.75.1)
609+
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.75.1)
610+
- FlipperKit/SKIOSNetworkPlugin (~> 0.75.1)
595611
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
612+
- hermes-engine (~> 0.7.2)
613+
- libevent (~> 2.1.12)
596614
- "onfido-react-native-sdk (from `../node_modules/@onfido/react-native-sdk`)"
597615
- Permission-LocationAccuracy (from `../node_modules/react-native-permissions/ios/LocationAccuracy`)
598616
- Permission-LocationAlways (from `../node_modules/react-native-permissions/ios/LocationAlways`)
@@ -605,6 +623,7 @@ DEPENDENCIES:
605623
- React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
606624
- React-Core (from `../node_modules/react-native/`)
607625
- React-Core/DevSupport (from `../node_modules/react-native/`)
626+
- React-Core/Hermes (from `../node_modules/react-native/`)
608627
- React-Core/RCTWebSocket (from `../node_modules/react-native/`)
609628
- React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
610629
- React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`)
@@ -687,6 +706,7 @@ SPEC REPOS:
687706
- GoogleAppMeasurement
688707
- GoogleDataTransport
689708
- GoogleUtilities
709+
- hermes-engine
690710
- libevent
691711
- nanopb
692712
- Onfido
@@ -868,6 +888,7 @@ SPEC CHECKSUMS:
868888
GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342
869889
GoogleDataTransport: 85fd18ff3019bb85d3f2c551d04c481dedf71fc9
870890
GoogleUtilities: eea970f4a389963963bffe8d8fabe43540678b9c
891+
hermes-engine: 7d97ba46a1e29bacf3e3c61ecb2804a5ddd02d4f
871892
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
872893
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
873894
Onfido: 116a268e4cb8b767c15285e8071c2e8304673cdf
@@ -876,7 +897,7 @@ SPEC CHECKSUMS:
876897
Permission-LocationAccuracy: e8adff9ede1b23b43b7054a4500113d515fc87a8
877898
Permission-LocationAlways: 7f7f373d086af7a81b2f4f20d65d29266ca2043b
878899
Permission-LocationWhenInUse: 3ae82a9feb5da4e94e386dba17c7dd3531af9feb
879-
Plaid: c02276ccc630a726a9ed790bf923d29839ff4017
900+
Plaid: f55c6acdc249245c6778a4045757eb4e839cca61
880901
PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58
881902
Protobuf: 7327d4444215b5f18e560a97f879ff5503c4581c
882903
RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
@@ -943,6 +964,6 @@ SPEC CHECKSUMS:
943964
Yoga: a7de31c64fe738607e7a3803e3f591a4b1df7393
944965
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
945966

946-
PODFILE CHECKSUM: 2b0558e25f01204512de38c2f656a63b5d86d19c
967+
PODFILE CHECKSUM: 2092930e33e7aa4d68cdf783d6174465bd3ce380
947968

948969
COCOAPODS: 1.10.1

‎src/libs/numberFormat/index.android.js renamed to ‎src/libs/numberFormat/index.native.js

File renamed without changes.

0 commit comments

Comments
 (0)