Skip to content

Commit 6c31b53

Browse files
committed
ios/Podfile: Follow {flipper -> react_native}_post_install rename.
Done to follow the template-app changes in facebook/react-native@5c09b3fb5 and facebook/react-native@ed237b479. Done after the RN v0.64 upgrade because the new code depends on changes to internal RN code (scripts/react_native_pods.rb). The two names refer to two different functions, and react_native_post_install is new in RN v0.64. That function calls flipper_post_install (if we've enabled Flipper by calling `use_flipper!`, that is), and it does some other stuff. That other stuff includes some changes to our project.pbxproj, apparently.
1 parent 82b2cfa commit 6c31b53

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

ios/Podfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ target 'ZulipMobile' do
1818
# Enables Flipper.
1919
#
2020
# Note that if you have use_frameworks! enabled, Flipper will not work and
21-
# you should disable these next few lines.
21+
# you should disable the next line.
2222
use_flipper!()
23+
2324
post_install do |installer|
24-
flipper_post_install(installer)
25+
react_native_post_install(installer)
2526
end
2627

2728
# unimodules provides Expo packages individually.

ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,6 @@ SPEC CHECKSUMS:
712712
Yoga: 575c581c63e0d35c9a83f4b46d01d63abc1100ac
713713
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
714714

715-
PODFILE CHECKSUM: 9fe222ff44850b658732e6016d8198adb2fef518
715+
PODFILE CHECKSUM: d654ed98ab31318f9ce195dc15a1148e60c2d4e9
716716

717717
COCOAPODS: 1.10.1

ios/ZulipMobile.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@
462462
COPY_PHASE_STRIP = NO;
463463
ENABLE_STRICT_OBJC_MSGSEND = YES;
464464
ENABLE_TESTABILITY = YES;
465+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
465466
GCC_C_LANGUAGE_STANDARD = gnu99;
466467
GCC_DYNAMIC_NO_PIC = NO;
467468
GCC_NO_COMMON_BLOCKS = YES;
@@ -528,6 +529,7 @@
528529
COPY_PHASE_STRIP = YES;
529530
ENABLE_NS_ASSERTIONS = NO;
530531
ENABLE_STRICT_OBJC_MSGSEND = YES;
532+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
531533
GCC_C_LANGUAGE_STANDARD = gnu99;
532534
GCC_NO_COMMON_BLOCKS = YES;
533535
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

0 commit comments

Comments
 (0)