Skip to content

Commit 3b52271

Browse files
okwasniewskiokwasniewski
committed
chore: sync Podfile.lock with upstream, remove unnecessary #endif
1 parent 0492fcc commit 3b52271

File tree

2 files changed

+36
-36
lines changed

2 files changed

+36
-36
lines changed

‎packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ @interface RCTAppDelegate () <
4949
}
5050
@end
5151

52-
#endif
53-
5452
#if TARGET_OS_VISION
5553
@interface GlassViewController : UIViewController
5654

‎packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@
376376
68CD48B71D2BCB2C007E06A9 /* Build JS Bundle */,
377377
79E8BE2B119D4C5CCD2F04B3 /* [RN] Copy Hermes Framework */,
378378
5625E703156DD564DE9175B0 /* [CP] Copy Pods Resources */,
379-
FA9D5B1EDCCF1279A1157A2D /* [CP] Embed Pods Frameworks */,
379+
0316F41B1065604DEEA41A3C /* [CP] Embed Pods Frameworks */,
380380
);
381381
buildRules = (
382382
);
@@ -396,7 +396,7 @@
396396
E7DB209C22B2BA84005AC45F /* Frameworks */,
397397
E7DB209D22B2BA84005AC45F /* Resources */,
398398
01934C30687B8C926E4F59CD /* [CP] Copy Pods Resources */,
399-
B3A406D440F7F60A503B9652 /* [CP] Embed Pods Frameworks */,
399+
A1D79CAC43858077F3735F2E /* [CP] Embed Pods Frameworks */,
400400
);
401401
buildRules = (
402402
);
@@ -417,7 +417,7 @@
417417
E7DB215022B2F332005AC45F /* Frameworks */,
418418
E7DB215122B2F332005AC45F /* Resources */,
419419
E446637427ECD101CAACE52B /* [CP] Copy Pods Resources */,
420-
9263EBF9AC248C00975C6F74 /* [CP] Embed Pods Frameworks */,
420+
C991B8CC267C749294E93C39 /* [CP] Embed Pods Frameworks */,
421421
);
422422
buildRules = (
423423
);
@@ -516,6 +516,23 @@
516516
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources.sh\"\n";
517517
showEnvVarsInLog = 0;
518518
};
519+
0316F41B1065604DEEA41A3C /* [CP] Embed Pods Frameworks */ = {
520+
isa = PBXShellScriptBuildPhase;
521+
buildActionMask = 2147483647;
522+
files = (
523+
);
524+
inputFileListPaths = (
525+
"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-input-files.xcfilelist",
526+
);
527+
name = "[CP] Embed Pods Frameworks";
528+
outputFileListPaths = (
529+
"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-output-files.xcfilelist",
530+
);
531+
runOnlyForDeploymentPostprocessing = 0;
532+
shellPath = /bin/sh;
533+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks.sh\"\n";
534+
showEnvVarsInLog = 0;
535+
};
519536
4F76596957F7356516B534CE /* [CP] Check Pods Manifest.lock */ = {
520537
isa = PBXShellScriptBuildPhase;
521538
buildActionMask = 2147483647;
@@ -589,21 +606,21 @@
589606
shellPath = /bin/sh;
590607
shellScript = ". ../react-native/sdks/hermes-engine/utils/copy-hermes-xcode.sh\n";
591608
};
592-
9263EBF9AC248C00975C6F74 /* [CP] Embed Pods Frameworks */ = {
609+
A1D79CAC43858077F3735F2E /* [CP] Embed Pods Frameworks */ = {
593610
isa = PBXShellScriptBuildPhase;
594611
buildActionMask = 2147483647;
595612
files = (
596613
);
597614
inputFileListPaths = (
598-
"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
615+
"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
599616
);
600617
name = "[CP] Embed Pods Frameworks";
601618
outputFileListPaths = (
602-
"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
619+
"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
603620
);
604621
runOnlyForDeploymentPostprocessing = 0;
605622
shellPath = /bin/sh;
606-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-frameworks.sh\"\n";
623+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-frameworks.sh\"\n";
607624
showEnvVarsInLog = 0;
608625
};
609626
ABDE2A52ACD1B95E14790B5E /* [CP] Check Pods Manifest.lock */ = {
@@ -628,23 +645,6 @@
628645
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
629646
showEnvVarsInLog = 0;
630647
};
631-
B3A406D440F7F60A503B9652 /* [CP] Embed Pods Frameworks */ = {
632-
isa = PBXShellScriptBuildPhase;
633-
buildActionMask = 2147483647;
634-
files = (
635-
);
636-
inputFileListPaths = (
637-
"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
638-
);
639-
name = "[CP] Embed Pods Frameworks";
640-
outputFileListPaths = (
641-
"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
642-
);
643-
runOnlyForDeploymentPostprocessing = 0;
644-
shellPath = /bin/sh;
645-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-frameworks.sh\"\n";
646-
showEnvVarsInLog = 0;
647-
};
648648
B7EB74515CDE78D98087DD53 /* [CP] Check Pods Manifest.lock */ = {
649649
isa = PBXShellScriptBuildPhase;
650650
buildActionMask = 2147483647;
@@ -667,38 +667,38 @@
667667
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
668668
showEnvVarsInLog = 0;
669669
};
670-
E446637427ECD101CAACE52B /* [CP] Copy Pods Resources */ = {
670+
C991B8CC267C749294E93C39 /* [CP] Embed Pods Frameworks */ = {
671671
isa = PBXShellScriptBuildPhase;
672672
buildActionMask = 2147483647;
673673
files = (
674674
);
675675
inputFileListPaths = (
676-
"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources-${CONFIGURATION}-input-files.xcfilelist",
676+
"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
677677
);
678-
name = "[CP] Copy Pods Resources";
678+
name = "[CP] Embed Pods Frameworks";
679679
outputFileListPaths = (
680-
"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources-${CONFIGURATION}-output-files.xcfilelist",
680+
"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
681681
);
682682
runOnlyForDeploymentPostprocessing = 0;
683683
shellPath = /bin/sh;
684-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources.sh\"\n";
684+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-frameworks.sh\"\n";
685685
showEnvVarsInLog = 0;
686686
};
687-
FA9D5B1EDCCF1279A1157A2D /* [CP] Embed Pods Frameworks */ = {
687+
E446637427ECD101CAACE52B /* [CP] Copy Pods Resources */ = {
688688
isa = PBXShellScriptBuildPhase;
689689
buildActionMask = 2147483647;
690690
files = (
691691
);
692692
inputFileListPaths = (
693-
"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-input-files.xcfilelist",
693+
"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources-${CONFIGURATION}-input-files.xcfilelist",
694694
);
695-
name = "[CP] Embed Pods Frameworks";
695+
name = "[CP] Copy Pods Resources";
696696
outputFileListPaths = (
697-
"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-output-files.xcfilelist",
697+
"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources-${CONFIGURATION}-output-files.xcfilelist",
698698
);
699699
runOnlyForDeploymentPostprocessing = 0;
700700
shellPath = /bin/sh;
701-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks.sh\"\n";
701+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources.sh\"\n";
702702
showEnvVarsInLog = 0;
703703
};
704704
/* End PBXShellScriptBuildPhase section */
@@ -952,6 +952,7 @@
952952
);
953953
REACT_NATIVE_PATH = "${PODS_ROOT}/../../react-native";
954954
SDKROOT = xros;
955+
USE_HERMES = true;
955956
WARNING_CFLAGS = (
956957
"-Wextra",
957958
"-Wall",
@@ -1044,6 +1045,7 @@
10441045
);
10451046
REACT_NATIVE_PATH = "${PODS_ROOT}/../../react-native";
10461047
SDKROOT = xros;
1048+
USE_HERMES = true;
10471049
VALIDATE_PRODUCT = YES;
10481050
WARNING_CFLAGS = (
10491051
"-Wextra",

0 commit comments

Comments
 (0)