Skip to content

Commit c25911b

Browse files
Emily Janzerfacebook-github-bot
Emily Janzer
authored and
facebook-github-bot
committed
Update cocoapods, fix RNTester
Summary: Updating pods and fixing an issue in the RN podfile. Changelog: [iOS][Fixed] Update podfile for RNTester Reviewed By: PeteTheHeat Differential Revision: D21336180 fbshipit-source-id: 4d51f53466ec2d432cf7a5775cb4d69d47423077
1 parent 12f8b25 commit c25911b

File tree

3 files changed

+42
-42
lines changed

3 files changed

+42
-42
lines changed

‎RNTester/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ if ENV['USE_FRAMEWORKS'] == '1'
5151
installer.pod_targets.each do |pod|
5252
if static_frameworks.include?(pod.name)
5353
def pod.build_type
54-
Pod::Target::BuildType.static_library
54+
Pod::BuildType.static_library
5555
end
5656
end
5757
end

‎RNTester/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,6 @@ SPEC CHECKSUMS:
510510
Yoga: f7fa200d8c49f97b54c9421079e781fb900b5cae
511511
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
512512

513-
PODFILE CHECKSUM: 5f0be4be03d6934478b9dd621bfbab4383b8c85d
513+
PODFILE CHECKSUM: ea07262e83c5b48d35bb3bfd5efe205794425c97
514514

515515
COCOAPODS: 1.9.1

‎RNTester/RNTesterPods.xcodeproj/project.pbxproj‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88

99
/* Begin PBXBuildFile section */
1010
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
11+
24EAD605675D8ABA2B64823A /* libPods-RNTesterIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 32FBB7182B91B9B63BE5B2E5 /* libPods-RNTesterIntegrationTests.a */; };
1112
272E6B3F1BEA849E001FCF37 /* UpdatePropertiesExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.m */; };
1213
27F441EC1BEBE5030039B79C /* FlexibleSizeExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */; };
1314
2DDEF0101F84BF7B00DBDF73 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2DDEF00F1F84BF7B00DBDF73 /* Images.xcassets */; };
1415
383889DA23A7398900D06C3E /* RCTConvert_UIColorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 383889D923A7398900D06C3E /* RCTConvert_UIColorTests.m */; };
1516
3D2AFAF51D646CF80089D1A3 /* legacy_image@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */; };
17+
4D55E71C4DD3105584EF88FF /* libPods-RNTesterUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CD2B3E80D03F084E29A91AE0 /* libPods-RNTesterUnitTests.a */; };
1618
5C60EB1C226440DB0018C04F /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C60EB1B226440DB0018C04F /* AppDelegate.mm */; };
1719
5CB07C9B226467E60039471C /* RNTesterTurboModuleProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CB07C99226467E60039471C /* RNTesterTurboModuleProvider.mm */; };
18-
6766440649168A1FAD1DB4A4 /* libPods-RNTesterIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5F836A7C97EC1BA121BA5A2A /* libPods-RNTesterIntegrationTests.a */; };
19-
6ABAB5205C9B8E0726E12033 /* libPods-RNTester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B5C8E567A4E6281113811CB1 /* libPods-RNTester.a */; };
2020
8145AE06241172D900A3F8DA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8145AE05241172D900A3F8DA /* LaunchScreen.storyboard */; };
21-
85C7978AB28C149170A56955 /* libPods-RNTesterUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 11941849F77C552FDC3EED77 /* libPods-RNTesterUnitTests.a */; };
21+
9DEC469CDBEB62F890D5E5A2 /* libPods-RNTester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 016F26780ADDDB6693E37088 /* libPods-RNTester.a */; };
2222
E7C1241A22BEC44B00DA25C0 /* RNTesterIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7C1241922BEC44B00DA25C0 /* RNTesterIntegrationTests.m */; };
2323
E7DB20D122B2BAA6005AC45F /* RCTBundleURLProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7DB20A922B2BAA3005AC45F /* RCTBundleURLProviderTests.m */; };
2424
E7DB20D222B2BAA6005AC45F /* RCTModuleInitNotificationRaceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7DB20AA22B2BAA3005AC45F /* RCTModuleInitNotificationRaceTests.m */; };
@@ -70,7 +70,7 @@
7070
/* End PBXContainerItemProxy section */
7171

7272
/* Begin PBXFileReference section */
73-
11941849F77C552FDC3EED77 /* libPods-RNTesterUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
73+
016F26780ADDDB6693E37088 /* libPods-RNTester.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester.a"; sourceTree = BUILT_PRODUCTS_DIR; };
7474
13B07F961A680F5B00A75B9A /* RNTester.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RNTester.app; sourceTree = BUILT_PRODUCTS_DIR; };
7575
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = RNTester/AppDelegate.h; sourceTree = "<group>"; };
7676
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RNTester/Info.plist; sourceTree = "<group>"; };
@@ -80,19 +80,19 @@
8080
27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FlexibleSizeExampleView.m; path = RNTester/NativeExampleViews/FlexibleSizeExampleView.m; sourceTree = "<group>"; };
8181
27F441EA1BEBE5030039B79C /* FlexibleSizeExampleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FlexibleSizeExampleView.h; path = RNTester/NativeExampleViews/FlexibleSizeExampleView.h; sourceTree = "<group>"; };
8282
2DDEF00F1F84BF7B00DBDF73 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = RNTester/Images.xcassets; sourceTree = "<group>"; };
83+
32FBB7182B91B9B63BE5B2E5 /* libPods-RNTesterIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
8384
34028D6B10F47E490042EB27 /* Pods-RNTesterUnitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterUnitTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests.debug.xcconfig"; sourceTree = "<group>"; };
8485
383889D923A7398900D06C3E /* RCTConvert_UIColorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTConvert_UIColorTests.m; sourceTree = "<group>"; };
8586
3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "legacy_image@2x.png"; path = "RNTester/legacy_image@2x.png"; sourceTree = "<group>"; };
8687
5BEC8567F3741044B6A5EFC5 /* Pods-RNTester.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester.release.xcconfig"; path = "Pods/Target Support Files/Pods-RNTester/Pods-RNTester.release.xcconfig"; sourceTree = "<group>"; };
8788
5C60EB1B226440DB0018C04F /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = RNTester/AppDelegate.mm; sourceTree = "<group>"; };
8889
5CB07C99226467E60039471C /* RNTesterTurboModuleProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RNTesterTurboModuleProvider.mm; path = RNTester/RNTesterTurboModuleProvider.mm; sourceTree = "<group>"; };
8990
5CB07C9A226467E60039471C /* RNTesterTurboModuleProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNTesterTurboModuleProvider.h; path = RNTester/RNTesterTurboModuleProvider.h; sourceTree = "<group>"; };
90-
5F836A7C97EC1BA121BA5A2A /* libPods-RNTesterIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
9191
7D51F73F0DA20287418D98BD /* Pods-RNTesterIntegrationTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterIntegrationTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.release.xcconfig"; sourceTree = "<group>"; };
9292
8145AE05241172D900A3F8DA /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = RNTester/LaunchScreen.storyboard; sourceTree = "<group>"; };
9393
972A459EE6CF8CC63531A088 /* Pods-RNTesterIntegrationTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterIntegrationTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.debug.xcconfig"; sourceTree = "<group>"; };
9494
98233960D1D6A1977D1C7EAF /* Pods-RNTester.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RNTester/Pods-RNTester.debug.xcconfig"; sourceTree = "<group>"; };
95-
B5C8E567A4E6281113811CB1 /* libPods-RNTester.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester.a"; sourceTree = BUILT_PRODUCTS_DIR; };
95+
CD2B3E80D03F084E29A91AE0 /* libPods-RNTesterUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
9696
E771AEEA22B44E3100EA1189 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RNTester/Info.plist; sourceTree = "<group>"; };
9797
E7C1241922BEC44B00DA25C0 /* RNTesterIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNTesterIntegrationTests.m; sourceTree = "<group>"; };
9898
E7DB209F22B2BA84005AC45F /* RNTesterUnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RNTesterUnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -173,7 +173,7 @@
173173
isa = PBXFrameworksBuildPhase;
174174
buildActionMask = 2147483647;
175175
files = (
176-
6ABAB5205C9B8E0726E12033 /* libPods-RNTester.a in Frameworks */,
176+
9DEC469CDBEB62F890D5E5A2 /* libPods-RNTester.a in Frameworks */,
177177
);
178178
runOnlyForDeploymentPostprocessing = 0;
179179
};
@@ -183,7 +183,7 @@
183183
files = (
184184
E7DB213122B2C649005AC45F /* JavaScriptCore.framework in Frameworks */,
185185
E7DB213222B2C67D005AC45F /* libOCMock.a in Frameworks */,
186-
85C7978AB28C149170A56955 /* libPods-RNTesterUnitTests.a in Frameworks */,
186+
4D55E71C4DD3105584EF88FF /* libPods-RNTesterUnitTests.a in Frameworks */,
187187
);
188188
runOnlyForDeploymentPostprocessing = 0;
189189
};
@@ -193,7 +193,7 @@
193193
files = (
194194
E7DB218C22B41FCD005AC45F /* XCTest.framework in Frameworks */,
195195
E7DB216722B2F69F005AC45F /* JavaScriptCore.framework in Frameworks */,
196-
6766440649168A1FAD1DB4A4 /* libPods-RNTesterIntegrationTests.a in Frameworks */,
196+
24EAD605675D8ABA2B64823A /* libPods-RNTesterIntegrationTests.a in Frameworks */,
197197
);
198198
runOnlyForDeploymentPostprocessing = 0;
199199
};
@@ -263,9 +263,9 @@
263263
E7DB211822B2BD53005AC45F /* libReact-RCTText.a */,
264264
E7DB211A22B2BD53005AC45F /* libReact-RCTVibration.a */,
265265
E7DB212222B2BD53005AC45F /* libyoga.a */,
266-
B5C8E567A4E6281113811CB1 /* libPods-RNTester.a */,
267-
5F836A7C97EC1BA121BA5A2A /* libPods-RNTesterIntegrationTests.a */,
268-
11941849F77C552FDC3EED77 /* libPods-RNTesterUnitTests.a */,
266+
016F26780ADDDB6693E37088 /* libPods-RNTester.a */,
267+
32FBB7182B91B9B63BE5B2E5 /* libPods-RNTesterIntegrationTests.a */,
268+
CD2B3E80D03F084E29A91AE0 /* libPods-RNTesterUnitTests.a */,
269269
);
270270
name = Frameworks;
271271
sourceTree = "<group>";
@@ -398,7 +398,7 @@
398398
13B07F8E1A680F5B00A75B9A /* Resources */,
399399
68CD48B71D2BCB2C007E06A9 /* Build JS Bundle */,
400400
5CF0FD27207FC6EC00C13D65 /* Start Metro */,
401-
33D41129F73FA216240D6A8E /* [CP] Copy Pods Resources */,
401+
EF2E405905E7906EE3359DDE /* [CP] Copy Pods Resources */,
402402
);
403403
buildRules = (
404404
);
@@ -417,7 +417,7 @@
417417
E7DB209B22B2BA84005AC45F /* Sources */,
418418
E7DB209C22B2BA84005AC45F /* Frameworks */,
419419
E7DB209D22B2BA84005AC45F /* Resources */,
420-
82168A981B1591BFD3DFCF51 /* [CP] Copy Pods Resources */,
420+
4B23EBE19DBB8A3ECC0D2F6A /* [CP] Copy Pods Resources */,
421421
);
422422
buildRules = (
423423
);
@@ -436,7 +436,7 @@
436436
E7DB214F22B2F332005AC45F /* Sources */,
437437
E7DB215022B2F332005AC45F /* Frameworks */,
438438
E7DB215122B2F332005AC45F /* Resources */,
439-
28D6EF6C8ED1C5CEB67629BA /* [CP] Copy Pods Resources */,
439+
C235B64D0917CDD748838189 /* [CP] Copy Pods Resources */,
440440
);
441441
buildRules = (
442442
);
@@ -515,38 +515,21 @@
515515
/* End PBXResourcesBuildPhase section */
516516

517517
/* Begin PBXShellScriptBuildPhase section */
518-
28D6EF6C8ED1C5CEB67629BA /* [CP] Copy Pods Resources */ = {
518+
4B23EBE19DBB8A3ECC0D2F6A /* [CP] Copy Pods Resources */ = {
519519
isa = PBXShellScriptBuildPhase;
520520
buildActionMask = 2147483647;
521521
files = (
522522
);
523523
inputFileListPaths = (
524-
"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources-${CONFIGURATION}-input-files.xcfilelist",
525-
);
526-
name = "[CP] Copy Pods Resources";
527-
outputFileListPaths = (
528-
"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources-${CONFIGURATION}-output-files.xcfilelist",
529-
);
530-
runOnlyForDeploymentPostprocessing = 0;
531-
shellPath = /bin/sh;
532-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources.sh\"\n";
533-
showEnvVarsInLog = 0;
534-
};
535-
33D41129F73FA216240D6A8E /* [CP] Copy Pods Resources */ = {
536-
isa = PBXShellScriptBuildPhase;
537-
buildActionMask = 2147483647;
538-
files = (
539-
);
540-
inputFileListPaths = (
541-
"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-resources-${CONFIGURATION}-input-files.xcfilelist",
524+
"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources-${CONFIGURATION}-input-files.xcfilelist",
542525
);
543526
name = "[CP] Copy Pods Resources";
544527
outputFileListPaths = (
545-
"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-resources-${CONFIGURATION}-output-files.xcfilelist",
528+
"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources-${CONFIGURATION}-output-files.xcfilelist",
546529
);
547530
runOnlyForDeploymentPostprocessing = 0;
548531
shellPath = /bin/sh;
549-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-resources.sh\"\n";
532+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources.sh\"\n";
550533
showEnvVarsInLog = 0;
551534
};
552535
56D84768A7BBB2750D674CF3 /* [CP] Check Pods Manifest.lock */ = {
@@ -622,21 +605,38 @@
622605
shellPath = /bin/sh;
623606
shellScript = "export NODE_BINARY=node\nPROJECT_ROOT=$SRCROOT/.. $SRCROOT/../scripts/react-native-xcode.sh RNTester/js/RNTesterApp.ios.js\n";
624607
};
625-
82168A981B1591BFD3DFCF51 /* [CP] Copy Pods Resources */ = {
608+
C235B64D0917CDD748838189 /* [CP] Copy Pods Resources */ = {
626609
isa = PBXShellScriptBuildPhase;
627610
buildActionMask = 2147483647;
628611
files = (
629612
);
630613
inputFileListPaths = (
631-
"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources-${CONFIGURATION}-input-files.xcfilelist",
614+
"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources-${CONFIGURATION}-input-files.xcfilelist",
632615
);
633616
name = "[CP] Copy Pods Resources";
634617
outputFileListPaths = (
635-
"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources-${CONFIGURATION}-output-files.xcfilelist",
618+
"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources-${CONFIGURATION}-output-files.xcfilelist",
636619
);
637620
runOnlyForDeploymentPostprocessing = 0;
638621
shellPath = /bin/sh;
639-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-resources.sh\"\n";
622+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-resources.sh\"\n";
623+
showEnvVarsInLog = 0;
624+
};
625+
EF2E405905E7906EE3359DDE /* [CP] Copy Pods Resources */ = {
626+
isa = PBXShellScriptBuildPhase;
627+
buildActionMask = 2147483647;
628+
files = (
629+
);
630+
inputFileListPaths = (
631+
"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-resources-${CONFIGURATION}-input-files.xcfilelist",
632+
);
633+
name = "[CP] Copy Pods Resources";
634+
outputFileListPaths = (
635+
"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-resources-${CONFIGURATION}-output-files.xcfilelist",
636+
);
637+
runOnlyForDeploymentPostprocessing = 0;
638+
shellPath = /bin/sh;
639+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-resources.sh\"\n";
640640
showEnvVarsInLog = 0;
641641
};
642642
F9CB97B0D9633939D43E75E0 /* [CP] Check Pods Manifest.lock */ = {

0 commit comments

Comments
 (0)