Skip to content

Commit d7a2c1f

Browse files
authored
fix: pod install failure on ios (#169)
* fix: ios pod install * chore: upgrade example to 0.73.10 * chore: remove xcode local
1 parent 8c2cf39 commit d7a2c1f

File tree

7 files changed

+1242
-545
lines changed

7 files changed

+1242
-545
lines changed

example/ios/HealthConnectExample.xcodeproj/project.pbxproj

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@
534534
buildSettings = {
535535
ALWAYS_SEARCH_USER_PATHS = NO;
536536
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
537-
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
537+
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
538538
CLANG_CXX_LIBRARY = "libc++";
539539
CLANG_ENABLE_MODULES = YES;
540540
CLANG_ENABLE_OBJC_ARC = YES;
@@ -590,14 +590,20 @@
590590
);
591591
MTL_ENABLE_DEBUG_INFO = YES;
592592
ONLY_ACTIVE_ARCH = YES;
593+
OTHER_CFLAGS = "$(inherited)";
593594
OTHER_CPLUSPLUSFLAGS = (
594595
"$(OTHER_CFLAGS)",
595596
"-DFOLLY_NO_CONFIG",
596597
"-DFOLLY_MOBILE=1",
597598
"-DFOLLY_USE_LIBCPP=1",
598599
);
600+
OTHER_LDFLAGS = (
601+
"$(inherited)",
602+
" ",
603+
);
599604
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
600605
SDKROOT = iphoneos;
606+
USE_HERMES = true;
601607
};
602608
name = Debug;
603609
};
@@ -606,7 +612,7 @@
606612
buildSettings = {
607613
ALWAYS_SEARCH_USER_PATHS = NO;
608614
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
609-
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
615+
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
610616
CLANG_CXX_LIBRARY = "libc++";
611617
CLANG_ENABLE_MODULES = YES;
612618
CLANG_ENABLE_OBJC_ARC = YES;
@@ -654,14 +660,20 @@
654660
"\"$(inherited)\"",
655661
);
656662
MTL_ENABLE_DEBUG_INFO = NO;
663+
OTHER_CFLAGS = "$(inherited)";
657664
OTHER_CPLUSPLUSFLAGS = (
658665
"$(OTHER_CFLAGS)",
659666
"-DFOLLY_NO_CONFIG",
660667
"-DFOLLY_MOBILE=1",
661668
"-DFOLLY_USE_LIBCPP=1",
662669
);
670+
OTHER_LDFLAGS = (
671+
"$(inherited)",
672+
" ",
673+
);
663674
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
664675
SDKROOT = iphoneos;
676+
USE_HERMES = true;
665677
VALIDATE_PRODUCT = YES;
666678
};
667679
name = Release;

example/ios/Podfile

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ
44
platform :ios, min_ios_version_supported
55
prepare_react_native_project!
66

7-
flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
7+
flipper_config = FlipperConfiguration.disabled
88

99
linkage = ENV['USE_FRAMEWORKS']
1010
if linkage != nil
@@ -38,14 +38,4 @@ target 'HealthConnectExample' do
3838
inherit! :complete
3939
# Pods for testing
4040
end
41-
42-
post_install do |installer|
43-
react_native_post_install(
44-
installer,
45-
# Set `mac_catalyst_enabled` to `true` in order to apply patches
46-
# necessary for Mac Catalyst builds
47-
:mac_catalyst_enabled => false
48-
)
49-
__apply_Xcode_12_5_M1_post_install_workaround(installer)
50-
end
51-
end
41+
end

0 commit comments

Comments
 (0)