Skip to content

Commit 4654ae1

Browse files
author
Christoph Pader
committed
revert RN changes
1 parent 4c1b1f6 commit 4654ae1

File tree

7 files changed

+2939
-3119
lines changed

7 files changed

+2939
-3119
lines changed

example/ios/GraphExample.xcodeproj/project.pbxproj

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -428,11 +428,11 @@
428428
);
429429
inputPaths = (
430430
"${PODS_ROOT}/Target Support Files/Pods-GraphExample/Pods-GraphExample-resources.sh",
431-
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
431+
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
432432
);
433433
name = "[CP] Copy Pods Resources";
434434
outputPaths = (
435-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
435+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
436436
);
437437
runOnlyForDeploymentPostprocessing = 0;
438438
shellPath = /bin/sh;
@@ -470,11 +470,11 @@
470470
);
471471
inputPaths = (
472472
"${PODS_ROOT}/Target Support Files/Pods-GraphExample-GraphExampleTests/Pods-GraphExample-GraphExampleTests-resources.sh",
473-
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
473+
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
474474
);
475475
name = "[CP] Copy Pods Resources";
476476
outputPaths = (
477-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
477+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
478478
);
479479
runOnlyForDeploymentPostprocessing = 0;
480480
shellPath = /bin/sh;
@@ -647,7 +647,6 @@
647647
DEVELOPMENT_TEAM = CJW62Q77E7;
648648
ENABLE_BITCODE = NO;
649649
INFOPLIST_FILE = GraphExample/Info.plist;
650-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
651650
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
652651
OTHER_LDFLAGS = (
653652
"$(inherited)",
@@ -671,7 +670,6 @@
671670
CURRENT_PROJECT_VERSION = 1;
672671
DEVELOPMENT_TEAM = CJW62Q77E7;
673672
INFOPLIST_FILE = GraphExample/Info.plist;
674-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
675673
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
676674
OTHER_LDFLAGS = (
677675
"$(inherited)",
@@ -796,7 +794,7 @@
796794
buildSettings = {
797795
ALWAYS_SEARCH_USER_PATHS = NO;
798796
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
799-
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
797+
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
800798
CLANG_CXX_LIBRARY = "libc++";
801799
CLANG_ENABLE_MODULES = YES;
802800
CLANG_ENABLE_OBJC_ARC = YES;
@@ -848,15 +846,8 @@
848846
);
849847
MTL_ENABLE_DEBUG_INFO = YES;
850848
ONLY_ACTIVE_ARCH = YES;
851-
OTHER_CFLAGS = "$(inherited)";
852-
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
853-
OTHER_LDFLAGS = (
854-
"$(inherited)",
855-
" ",
856-
);
857849
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
858850
SDKROOT = iphoneos;
859-
USE_HERMES = true;
860851
};
861852
name = Debug;
862853
};
@@ -865,7 +856,7 @@
865856
buildSettings = {
866857
ALWAYS_SEARCH_USER_PATHS = NO;
867858
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
868-
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
859+
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
869860
CLANG_CXX_LIBRARY = "libc++";
870861
CLANG_ENABLE_MODULES = YES;
871862
CLANG_ENABLE_OBJC_ARC = YES;
@@ -909,15 +900,8 @@
909900
"\"$(inherited)\"",
910901
);
911902
MTL_ENABLE_DEBUG_INFO = NO;
912-
OTHER_CFLAGS = "$(inherited)";
913-
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
914-
OTHER_LDFLAGS = (
915-
"$(inherited)",
916-
" ",
917-
);
918903
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
919904
SDKROOT = iphoneos;
920-
USE_HERMES = true;
921905
VALIDATE_PRODUCT = YES;
922906
};
923907
name = Release;

example/ios/Podfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@ target 'GraphExample' do
5555
# necessary for Mac Catalyst builds
5656
:mac_catalyst_enabled => false
5757
)
58-
59-
installer.pods_project.targets.each do |target|
60-
target.build_configurations.each do |config|
61-
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
62-
end
63-
end
58+
__apply_Xcode_12_5_M1_post_install_workaround(installer)
6459
end
6560
end

0 commit comments

Comments
 (0)