Skip to content

Commit 2cd2fbf

Browse files
chrisbobbegnprice
chrisbobbe
authored and
gnprice
committed
ios: Disable Flipper
Our build times could probably have benefited from this for a while now; we never got into the habit of actually using Flipper. Flipper is a debugging tool. I believe its code has not been included in release builds. Anyway, disable it now, since things would otherwise be busted with recent Xcode, as mentioned in a comment. Done by commenting out the relevant line in the Podfile, and running `yarn` (resulting in a `pod install`) and doing a debug build.
1 parent dff4d4d commit 2cd2fbf

File tree

3 files changed

+5
-137
lines changed

3 files changed

+5
-137
lines changed

‎ios/Podfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ target 'ZulipMobile' do
2727
#
2828
# Note that if you have use_frameworks! enabled, Flipper will not work and
2929
# you should disable the next line.
30-
use_flipper!()
30+
# Flipper is breaking things with recent Xcode; cut it out (we've never
31+
# used it):
32+
# https://github.com/facebook/react-native/issues/43335
33+
# use_flipper!()
3134

3235
post_install do |installer|
3336
react_native_post_install(installer)

‎ios/Podfile.lock

Lines changed: 1 addition & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
PODS:
22
- boost (1.76.0)
3-
- CocoaAsyncSocket (7.6.5)
43
- DoubleConversion (1.1.6)
54
- EXAppleAuthentication (4.2.1):
65
- ExpoModulesCore
@@ -38,71 +37,8 @@ PODS:
3837
- React-Core (= 0.68.7)
3938
- React-jsi (= 0.68.7)
4039
- ReactCommon/turbomodule/core (= 0.68.7)
41-
- Flipper (0.125.0):
42-
- Flipper-Folly (~> 2.6)
43-
- Flipper-RSocket (~> 1.4)
44-
- Flipper-Boost-iOSX (1.76.0.1.11)
45-
- Flipper-DoubleConversion (3.2.0)
46-
- Flipper-Fmt (7.1.7)
47-
- Flipper-Folly (2.6.10):
48-
- Flipper-Boost-iOSX
49-
- Flipper-DoubleConversion
50-
- Flipper-Fmt (= 7.1.7)
51-
- Flipper-Glog
52-
- libevent (~> 2.1.12)
53-
- OpenSSL-Universal (= 1.1.1100)
54-
- Flipper-Glog (0.5.0.4)
55-
- Flipper-PeerTalk (0.0.4)
56-
- Flipper-RSocket (1.4.3):
57-
- Flipper-Folly (~> 2.6)
58-
- FlipperKit (0.125.0):
59-
- FlipperKit/Core (= 0.125.0)
60-
- FlipperKit/Core (0.125.0):
61-
- Flipper (~> 0.125.0)
62-
- FlipperKit/CppBridge
63-
- FlipperKit/FBCxxFollyDynamicConvert
64-
- FlipperKit/FBDefines
65-
- FlipperKit/FKPortForwarding
66-
- SocketRocket (~> 0.6.0)
67-
- FlipperKit/CppBridge (0.125.0):
68-
- Flipper (~> 0.125.0)
69-
- FlipperKit/FBCxxFollyDynamicConvert (0.125.0):
70-
- Flipper-Folly (~> 2.6)
71-
- FlipperKit/FBDefines (0.125.0)
72-
- FlipperKit/FKPortForwarding (0.125.0):
73-
- CocoaAsyncSocket (~> 7.6)
74-
- Flipper-PeerTalk (~> 0.0.4)
75-
- FlipperKit/FlipperKitHighlightOverlay (0.125.0)
76-
- FlipperKit/FlipperKitLayoutHelpers (0.125.0):
77-
- FlipperKit/Core
78-
- FlipperKit/FlipperKitHighlightOverlay
79-
- FlipperKit/FlipperKitLayoutTextSearchable
80-
- FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0):
81-
- FlipperKit/Core
82-
- FlipperKit/FlipperKitHighlightOverlay
83-
- FlipperKit/FlipperKitLayoutHelpers
84-
- YogaKit (~> 1.18)
85-
- FlipperKit/FlipperKitLayoutPlugin (0.125.0):
86-
- FlipperKit/Core
87-
- FlipperKit/FlipperKitHighlightOverlay
88-
- FlipperKit/FlipperKitLayoutHelpers
89-
- FlipperKit/FlipperKitLayoutIOSDescriptors
90-
- FlipperKit/FlipperKitLayoutTextSearchable
91-
- YogaKit (~> 1.18)
92-
- FlipperKit/FlipperKitLayoutTextSearchable (0.125.0)
93-
- FlipperKit/FlipperKitNetworkPlugin (0.125.0):
94-
- FlipperKit/Core
95-
- FlipperKit/FlipperKitReactPlugin (0.125.0):
96-
- FlipperKit/Core
97-
- FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0):
98-
- FlipperKit/Core
99-
- FlipperKit/SKIOSNetworkPlugin (0.125.0):
100-
- FlipperKit/Core
101-
- FlipperKit/FlipperKitNetworkPlugin
10240
- fmt (6.2.1)
10341
- glog (0.3.5)
104-
- libevent (2.1.12)
105-
- OpenSSL-Universal (1.1.1100)
10642
- RCT-Folly (2021.06.28.00-v2):
10743
- boost
10844
- DoubleConversion
@@ -444,11 +380,8 @@ PODS:
444380
- Sentry/HybridSDK (8.17.1):
445381
- SentryPrivate (= 8.17.1)
446382
- SentryPrivate (8.17.1)
447-
- SocketRocket (0.6.0)
448383
- Toast (4.0.0)
449384
- Yoga (1.14.0)
450-
- YogaKit (1.18.1):
451-
- Yoga (~> 1.14)
452385

453386
DEPENDENCIES:
454387
- boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
@@ -468,29 +401,7 @@ DEPENDENCIES:
468401
- EXSQLite (from `../node_modules/expo-sqlite/ios`)
469402
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
470403
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
471-
- Flipper (= 0.125.0)
472-
- Flipper-Boost-iOSX (= 1.76.0.1.11)
473-
- Flipper-DoubleConversion (= 3.2.0)
474-
- Flipper-Fmt (= 7.1.7)
475-
- Flipper-Folly (= 2.6.10)
476-
- Flipper-Glog (= 0.5.0.4)
477-
- Flipper-PeerTalk (= 0.0.4)
478-
- Flipper-RSocket (= 1.4.3)
479-
- FlipperKit (= 0.125.0)
480-
- FlipperKit/Core (= 0.125.0)
481-
- FlipperKit/CppBridge (= 0.125.0)
482-
- FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0)
483-
- FlipperKit/FBDefines (= 0.125.0)
484-
- FlipperKit/FKPortForwarding (= 0.125.0)
485-
- FlipperKit/FlipperKitHighlightOverlay (= 0.125.0)
486-
- FlipperKit/FlipperKitLayoutPlugin (= 0.125.0)
487-
- FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0)
488-
- FlipperKit/FlipperKitNetworkPlugin (= 0.125.0)
489-
- FlipperKit/FlipperKitReactPlugin (= 0.125.0)
490-
- FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0)
491-
- FlipperKit/SKIOSNetworkPlugin (= 0.125.0)
492404
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
493-
- OpenSSL-Universal (= 1.1.1100)
494405
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
495406
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
496407
- RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
@@ -540,24 +451,10 @@ DEPENDENCIES:
540451

541452
SPEC REPOS:
542453
trunk:
543-
- CocoaAsyncSocket
544-
- Flipper
545-
- Flipper-Boost-iOSX
546-
- Flipper-DoubleConversion
547-
- Flipper-Fmt
548-
- Flipper-Folly
549-
- Flipper-Glog
550-
- Flipper-PeerTalk
551-
- Flipper-RSocket
552-
- FlipperKit
553454
- fmt
554-
- libevent
555-
- OpenSSL-Universal
556455
- Sentry
557456
- SentryPrivate
558-
- SocketRocket
559457
- Toast
560-
- YogaKit
561458

562459
EXTERNAL SOURCES:
563460
boost:
@@ -687,7 +584,6 @@ EXTERNAL SOURCES:
687584

688585
SPEC CHECKSUMS:
689586
boost: a7c83b31436843459a1961bfd74b96033dc77234
690-
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
691587
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
692588
EXAppleAuthentication: 709a807fe7f48ac6986a2ceed206ee6a8baf28df
693589
EXApplication: d6562af1204162e0ac46d341a7d4e5dc720b33de
@@ -704,19 +600,8 @@ SPEC CHECKSUMS:
704600
EXSQLite: 2b9accd925438293f9f39e0a57a08cca13bdffb2
705601
FBLazyVector: 63b89dc85804d5817261f56dc4cfb43a9b6d57f5
706602
FBReactNativeSpec: 1fa200a9862d9369a53b6fddbbfcdc22bab24062
707-
Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
708-
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
709-
Flipper-DoubleConversion: 3d3d04a078d4f3a1b6c6916587f159dc11f232c4
710-
Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
711-
Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
712-
Flipper-Glog: 87bc98ff48de90cb5b0b5114ed3da79d85ee2dd4
713-
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
714-
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
715-
FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
716603
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
717604
glog: 476ee3e89abb49e07f822b48323c51c57124b572
718-
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
719-
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
720605
RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8
721606
RCTRequired: 530916cd48c5f7cf1fc16966ad5ea01638ca4799
722607
RCTTypeSafety: 5fb4cb3080efd582e5563c3e9a0e459fc51396c5
@@ -762,11 +647,9 @@ SPEC CHECKSUMS:
762647
RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
763648
Sentry: d9f99f9cc13777c5d938650c1e1c85047bb4f0d1
764649
SentryPrivate: 839b1e58addf58624087a80b2628e543193fa8ef
765-
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
766650
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
767651
Yoga: 0bc4b37c3b8a345336ff601e2cf7d9704bab7e93
768-
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
769652

770-
PODFILE CHECKSUM: d89f3b1e89d483f9f945122b7b9ecb7c39b9fe75
653+
PODFILE CHECKSUM: fe17e730c08576abd6133867554e6cb03f685fee
771654

772655
COCOAPODS: 1.13.0

‎ios/ZulipMobile.xcodeproj/project.pbxproj

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@
182182
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
183183
6FD412E618344A7FB938E4AC /* Upload Debug Symbols to Sentry */,
184184
B6911BDB8DAEAAB45D9600A4 /* [CP] Copy Pods Resources */,
185-
ACF6F8EB7414F86013AD7B2D /* [CP] Embed Pods Frameworks */,
186185
);
187186
buildRules = (
188187
);
@@ -318,23 +317,6 @@
318317
shellPath = /bin/sh;
319318
shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../node_modules/react-native/scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n exit 2\n fi\n else\n open \"$SRCROOT/../node_modules/react-native/scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n fi\nfi\n";
320319
};
321-
ACF6F8EB7414F86013AD7B2D /* [CP] Embed Pods Frameworks */ = {
322-
isa = PBXShellScriptBuildPhase;
323-
buildActionMask = 2147483647;
324-
files = (
325-
);
326-
inputFileListPaths = (
327-
"${PODS_ROOT}/Target Support Files/Pods-ZulipMobile/Pods-ZulipMobile-frameworks-${CONFIGURATION}-input-files.xcfilelist",
328-
);
329-
name = "[CP] Embed Pods Frameworks";
330-
outputFileListPaths = (
331-
"${PODS_ROOT}/Target Support Files/Pods-ZulipMobile/Pods-ZulipMobile-frameworks-${CONFIGURATION}-output-files.xcfilelist",
332-
);
333-
runOnlyForDeploymentPostprocessing = 0;
334-
shellPath = /bin/sh;
335-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ZulipMobile/Pods-ZulipMobile-frameworks.sh\"\n";
336-
showEnvVarsInLog = 0;
337-
};
338320
B6911BDB8DAEAAB45D9600A4 /* [CP] Copy Pods Resources */ = {
339321
isa = PBXShellScriptBuildPhase;
340322
buildActionMask = 2147483647;

0 commit comments

Comments
 (0)