Skip to content

Commit a94d610

Browse files
rozelerozele
committed
Merge branch 'fbmaster' into staging
2 parents 3227b99 + 26bac2b commit a94d610

38 files changed

+531
-2891
lines changed

‎RNTester.xcodeproj/project.pbxproj

+13
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
192F69B91E82409A008692C7 /* RCTConvert_YGValueTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 192F69B61E82409A008692C7 /* RCTConvert_YGValueTests.m */; };
5454
192F69BA1E82409A008692C7 /* RCTNativeAnimatedNodesManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 192F69B71E82409A008692C7 /* RCTNativeAnimatedNodesManagerTests.m */; };
5555
192F69DA1E8240E2008692C7 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13E501A31D07A502005F35D8 /* libRCTAnimation.a */; };
56+
19BA88D51F84344F00741C5A /* RCTBlobManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 19BA88D41F84344F00741C5A /* RCTBlobManagerTests.m */; };
57+
19BA89031F8439A700741C5A /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5281CA511EEAC9A700AC40CD /* libRCTBlob.a */; };
5658
272E6B3F1BEA849E001FCF37 /* UpdatePropertiesExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.m */; };
5759
27B885561BED29AF00008352 /* RCTRootViewIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 27B885551BED29AF00008352 /* RCTRootViewIntegrationTests.m */; };
5860
27F441EC1BEBE5030039B79C /* FlexibleSizeExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */; };
@@ -515,6 +517,7 @@
515517
192F69B51E82409A008692C7 /* RCTAnimationUtilsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAnimationUtilsTests.m; sourceTree = "<group>"; };
516518
192F69B61E82409A008692C7 /* RCTConvert_YGValueTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTConvert_YGValueTests.m; sourceTree = "<group>"; };
517519
192F69B71E82409A008692C7 /* RCTNativeAnimatedNodesManagerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTNativeAnimatedNodesManagerTests.m; sourceTree = "<group>"; };
520+
19BA88D41F84344F00741C5A /* RCTBlobManagerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTBlobManagerTests.m; sourceTree = "<group>"; };
518521
272E6B3B1BEA849E001FCF37 /* UpdatePropertiesExampleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UpdatePropertiesExampleView.h; path = RNTester/NativeExampleViews/UpdatePropertiesExampleView.h; sourceTree = "<group>"; };
519522
272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UpdatePropertiesExampleView.m; path = RNTester/NativeExampleViews/UpdatePropertiesExampleView.m; sourceTree = "<group>"; };
520523
27B885551BED29AF00008352 /* RCTRootViewIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRootViewIntegrationTests.m; sourceTree = "<group>"; };
@@ -553,6 +556,7 @@
553556
isa = PBXFrameworksBuildPhase;
554557
buildActionMask = 2147483647;
555558
files = (
559+
19BA89031F8439A700741C5A /* libRCTBlob.a in Frameworks */,
556560
192F69DA1E8240E2008692C7 /* libRCTAnimation.a in Frameworks */,
557561
14D6D71E1B2222EF001FB087 /* libRCTActionSheet.a in Frameworks */,
558562
14D6D7201B2222EF001FB087 /* libRCTGeolocation.a in Frameworks */,
@@ -767,6 +771,7 @@
767771
isa = PBXGroup;
768772
children = (
769773
192F69B51E82409A008692C7 /* RCTAnimationUtilsTests.m */,
774+
19BA88D41F84344F00741C5A /* RCTBlobManagerTests.m */,
770775
192F69B61E82409A008692C7 /* RCTConvert_YGValueTests.m */,
771776
192F69B71E82409A008692C7 /* RCTNativeAnimatedNodesManagerTests.m */,
772777
13B6C1A21C34225900D3FAF5 /* RCTURLUtilsTests.m */,
@@ -884,6 +889,13 @@
884889
name = Products;
885890
sourceTree = "<group>";
886891
};
892+
19BA89021F8439A700741C5A /* Frameworks */ = {
893+
isa = PBXGroup;
894+
children = (
895+
);
896+
name = Frameworks;
897+
sourceTree = "<group>";
898+
};
887899
272E6B3A1BEA846C001FCF37 /* NativeExampleViews */ = {
888900
isa = PBXGroup;
889901
children = (
@@ -1683,6 +1695,7 @@
16831695
8385CF041B87479200C6273E /* RCTImageLoaderHelpers.m in Sources */,
16841696
192F69B91E82409A008692C7 /* RCTConvert_YGValueTests.m in Sources */,
16851697
BC9C03401DC9F1D600B1C635 /* RCTDevMenuTests.m in Sources */,
1698+
19BA88D51F84344F00741C5A /* RCTBlobManagerTests.m in Sources */,
16861699
68FF44381CF6111500720EFD /* RCTBundleURLProviderTests.m in Sources */,
16871700
8385CEF51B873B5C00C6273E /* RCTImageLoaderTests.m in Sources */,
16881701
);

‎RNTesterIntegrationTests/RNTesterSnapshotTests.m

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ - (void)test##name \
4848
// No switch or slider available on tvOS
4949
RCT_TEST(SwitchExample)
5050
RCT_TEST(SliderExample)
51-
// TabBarExample on tvOS passes locally but not on Travis
5251
RCT_TEST(TabBarExample)
5352
#endif
5453

‎RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testARTExample_1-iOS10_tvOS.png

-79 Bytes
Loading

‎RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testLayoutExample_1-iOS10_tvOS.png

870 Bytes
Loading

‎RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testScrollViewExample_1-iOS10_tvOS.png

68.5 KB
Loading

‎RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1-iOS10@2x.png

73 Bytes
Loading

‎RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1-iOS11@2x.png

33 Bytes
Loading

‎RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTabBarExample_1@2x.png

-1 Bytes
Loading

‎RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testTextExample_1-iOS10_tvOS.png

54 Bytes
Loading

‎RNTesterIntegrationTests/ReferenceImages/RNTester-js-RNTesterApp.ios/testViewExample_1-iOS10_tvOS.png

-35 Bytes
Loading

0 commit comments

Comments
 (0)