Skip to content

Commit 7522b72

Browse files
committed
Update RN to 0.52.2 (RNTester)
1 parent 22734e7 commit 7522b72

File tree

13 files changed

+119
-77
lines changed

13 files changed

+119
-77
lines changed

RNTester/.flowconfig

Lines changed: 0 additions & 45 deletions
This file was deleted.

RNTester/android/app/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ import com.android.build.OutputFile
7272
* ]
7373
*/
7474

75+
project.ext.react = [
76+
entryFile: "index.js"
77+
]
78+
7579
apply from: "../../node_modules/react-native/react.gradle"
7680

7781
/**

RNTester/android/app/src/main/java/com/rntester/MainApplication.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ protected List<ReactPackage> getPackages() {
2525
new MainReactPackage()
2626
);
2727
}
28+
29+
@Override
30+
protected String getJSMainModuleName() {
31+
return "index";
32+
}
2833
};
2934

3035
@Override
2.15 KB
Loading
4.73 KB
Loading
7.54 KB
Loading
51 KB
Binary file not shown.

RNTester/index.android.js

Lines changed: 0 additions & 11 deletions
This file was deleted.
File renamed without changes.

RNTester/ios/RNTester.xcodeproj/project.pbxproj

Lines changed: 97 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,18 @@
2525
2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
2626
2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
2727
2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
28-
2D02E4C21E0B4AEC006451C7 /* libRCTAnimation-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */; };
28+
2D02E4C21E0B4AEC006451C7 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157351DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
2929
2D02E4C31E0B4AEC006451C7 /* libRCTImage-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */; };
3030
2D02E4C41E0B4AEC006451C7 /* libRCTLinking-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E881DF850E9000B6D8A /* libRCTLinking-tvOS.a */; };
3131
2D02E4C51E0B4AEC006451C7 /* libRCTNetwork-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E8C1DF850E9000B6D8A /* libRCTNetwork-tvOS.a */; };
3232
2D02E4C61E0B4AEC006451C7 /* libRCTSettings-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E901DF850E9000B6D8A /* libRCTSettings-tvOS.a */; };
3333
2D02E4C71E0B4AEC006451C7 /* libRCTText-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E941DF850E9000B6D8A /* libRCTText-tvOS.a */; };
3434
2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */; };
35-
2D02E4C91E0B4AEC006451C7 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
35+
2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; };
3636
2DCD954D1E0B4F2C00145EB5 /* RNTesterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* RNTesterTests.m */; };
3737
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
3838
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
39+
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
3940
/* End PBXBuildFile section */
4041

4142
/* Begin PBXContainerItemProxy section */
@@ -109,6 +110,27 @@
109110
remoteGlobalIDString = 2D02E47A1E0B4A5D006451C7;
110111
remoteInfo = "RNTester-tvOS";
111112
};
113+
2D16E6711FA4F8DC00B85C8A /* PBXContainerItemProxy */ = {
114+
isa = PBXContainerItemProxy;
115+
containerPortal = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */;
116+
proxyType = 2;
117+
remoteGlobalIDString = ADD01A681E09402E00F6D226;
118+
remoteInfo = "RCTBlob-tvOS";
119+
};
120+
2D16E6831FA4F8DC00B85C8A /* PBXContainerItemProxy */ = {
121+
isa = PBXContainerItemProxy;
122+
containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
123+
proxyType = 2;
124+
remoteGlobalIDString = 3DBE0D001F3B181A0099AA32;
125+
remoteInfo = fishhook;
126+
};
127+
2D16E6851FA4F8DC00B85C8A /* PBXContainerItemProxy */ = {
128+
isa = PBXContainerItemProxy;
129+
containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
130+
proxyType = 2;
131+
remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32;
132+
remoteInfo = "fishhook-tvOS";
133+
};
112134
3DAD3E831DF850E9000B6D8A /* PBXContainerItemProxy */ = {
113135
isa = PBXContainerItemProxy;
114136
containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
@@ -228,6 +250,13 @@
228250
remoteGlobalIDString = 58B5119B1A9E6C1200147676;
229251
remoteInfo = RCTText;
230252
};
253+
ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */ = {
254+
isa = PBXContainerItemProxy;
255+
containerPortal = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */;
256+
proxyType = 2;
257+
remoteGlobalIDString = 358F4ED71D1E81A9004DF814;
258+
remoteInfo = RCTBlob;
259+
};
231260
/* End PBXContainerItemProxy section */
232261

233262
/* Begin PBXFileReference section */
@@ -252,9 +281,11 @@
252281
146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
253282
2D02E47B1E0B4A5D006451C7 /* RNTester-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "RNTester-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
254283
2D02E4901E0B4A5D006451C7 /* RNTester-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "RNTester-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
284+
2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
255285
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
256286
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
257287
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
288+
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
258289
/* End PBXFileReference section */
259290

260291
/* Begin PBXFrameworksBuildPhase section */
@@ -270,6 +301,8 @@
270301
isa = PBXFrameworksBuildPhase;
271302
buildActionMask = 2147483647;
272303
files = (
304+
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */,
305+
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
273306
146834051AC3E58100842450 /* libReact.a in Frameworks */,
274307
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
275308
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
@@ -288,8 +321,8 @@
288321
isa = PBXFrameworksBuildPhase;
289322
buildActionMask = 2147483647;
290323
files = (
291-
2D02E4C91E0B4AEC006451C7 /* libReact.a in Frameworks */,
292-
2D02E4C21E0B4AEC006451C7 /* libRCTAnimation-tvOS.a in Frameworks */,
324+
2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */,
325+
2D02E4C21E0B4AEC006451C7 /* libRCTAnimation.a in Frameworks */,
293326
2D02E4C31E0B4AEC006451C7 /* libRCTImage-tvOS.a in Frameworks */,
294327
2D02E4C41E0B4AEC006451C7 /* libRCTLinking-tvOS.a in Frameworks */,
295328
2D02E4C51E0B4AEC006451C7 /* libRCTNetwork-tvOS.a in Frameworks */,
@@ -382,6 +415,8 @@
382415
children = (
383416
139FDEF41B06529B00C62182 /* libRCTWebSocket.a */,
384417
3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */,
418+
2D16E6841FA4F8DC00B85C8A /* libfishhook.a */,
419+
2D16E6861FA4F8DC00B85C8A /* libfishhook-tvOS.a */,
385420
);
386421
name = Products;
387422
sourceTree = "<group>";
@@ -404,22 +439,30 @@
404439
isa = PBXGroup;
405440
children = (
406441
146834041AC3E56700842450 /* libReact.a */,
407-
3DAD3EA31DF850E9000B6D8A /* libReact.a */,
408442
3DAD3EA51DF850E9000B6D8A /* libyoga.a */,
409443
3DAD3EA71DF850E9000B6D8A /* libyoga.a */,
410444
3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */,
411445
3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
412446
3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
413447
3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
448+
3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */,
414449
);
415450
name = Products;
416451
sourceTree = "<group>";
417452
};
453+
2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
454+
isa = PBXGroup;
455+
children = (
456+
2D16E6891FA4F8E400B85C8A /* libReact.a */,
457+
);
458+
name = Frameworks;
459+
sourceTree = "<group>";
460+
};
418461
5E91572E1DD0AC6500FF2AA8 /* Products */ = {
419462
isa = PBXGroup;
420463
children = (
421464
5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */,
422-
5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */,
465+
5E9157351DD0AC6500FF2AA8 /* libRCTAnimation.a */,
423466
);
424467
name = Products;
425468
sourceTree = "<group>";
@@ -439,6 +482,7 @@
439482
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */,
440483
146833FF1AC3E56700842450 /* React.xcodeproj */,
441484
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
485+
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */,
442486
00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */,
443487
00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */,
444488
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */,
@@ -467,10 +511,12 @@
467511
832341AE1AAA6A7D00B99B32 /* Libraries */,
468512
00E356EF1AD99517003FC87E /* RNTesterTests */,
469513
83CBBA001A601CBA00E9B192 /* Products */,
514+
2D16E6871FA4F8E400B85C8A /* Frameworks */,
470515
);
471516
indentWidth = 2;
472517
sourceTree = "<group>";
473518
tabWidth = 2;
519+
usesTabs = 0;
474520
};
475521
83CBBA001A601CBA00E9B192 /* Products */ = {
476522
isa = PBXGroup;
@@ -483,6 +529,15 @@
483529
name = Products;
484530
sourceTree = "<group>";
485531
};
532+
ADBDB9201DFEBF0600ED6528 /* Products */ = {
533+
isa = PBXGroup;
534+
children = (
535+
ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */,
536+
2D16E6721FA4F8DC00B85C8A /* libRCTBlob-tvOS.a */,
537+
);
538+
name = Products;
539+
sourceTree = "<group>";
540+
};
486541
/* End PBXGroup section */
487542

488543
/* Begin PBXNativeTarget section */
@@ -602,6 +657,10 @@
602657
ProductGroup = 5E91572E1DD0AC6500FF2AA8 /* Products */;
603658
ProjectRef = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */;
604659
},
660+
{
661+
ProductGroup = ADBDB9201DFEBF0600ED6528 /* Products */;
662+
ProjectRef = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */;
663+
},
605664
{
606665
ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */;
607666
ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
@@ -706,6 +765,27 @@
706765
remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */;
707766
sourceTree = BUILT_PRODUCTS_DIR;
708767
};
768+
2D16E6721FA4F8DC00B85C8A /* libRCTBlob-tvOS.a */ = {
769+
isa = PBXReferenceProxy;
770+
fileType = archive.ar;
771+
path = "libRCTBlob-tvOS.a";
772+
remoteRef = 2D16E6711FA4F8DC00B85C8A /* PBXContainerItemProxy */;
773+
sourceTree = BUILT_PRODUCTS_DIR;
774+
};
775+
2D16E6841FA4F8DC00B85C8A /* libfishhook.a */ = {
776+
isa = PBXReferenceProxy;
777+
fileType = archive.ar;
778+
path = libfishhook.a;
779+
remoteRef = 2D16E6831FA4F8DC00B85C8A /* PBXContainerItemProxy */;
780+
sourceTree = BUILT_PRODUCTS_DIR;
781+
};
782+
2D16E6861FA4F8DC00B85C8A /* libfishhook-tvOS.a */ = {
783+
isa = PBXReferenceProxy;
784+
fileType = archive.ar;
785+
path = "libfishhook-tvOS.a";
786+
remoteRef = 2D16E6851FA4F8DC00B85C8A /* PBXContainerItemProxy */;
787+
sourceTree = BUILT_PRODUCTS_DIR;
788+
};
709789
3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */ = {
710790
isa = PBXReferenceProxy;
711791
fileType = archive.ar;
@@ -748,10 +828,10 @@
748828
remoteRef = 3DAD3E981DF850E9000B6D8A /* PBXContainerItemProxy */;
749829
sourceTree = BUILT_PRODUCTS_DIR;
750830
};
751-
3DAD3EA31DF850E9000B6D8A /* libReact.a */ = {
831+
3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */ = {
752832
isa = PBXReferenceProxy;
753833
fileType = archive.ar;
754-
path = libReact.a;
834+
path = "libReact-tvOS.a";
755835
remoteRef = 3DAD3EA21DF850E9000B6D8A /* PBXContainerItemProxy */;
756836
sourceTree = BUILT_PRODUCTS_DIR;
757837
};
@@ -804,10 +884,10 @@
804884
remoteRef = 5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */;
805885
sourceTree = BUILT_PRODUCTS_DIR;
806886
};
807-
5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */ = {
887+
5E9157351DD0AC6500FF2AA8 /* libRCTAnimation.a */ = {
808888
isa = PBXReferenceProxy;
809889
fileType = archive.ar;
810-
path = "libRCTAnimation-tvOS.a";
890+
path = libRCTAnimation.a;
811891
remoteRef = 5E9157341DD0AC6500FF2AA8 /* PBXContainerItemProxy */;
812892
sourceTree = BUILT_PRODUCTS_DIR;
813893
};
@@ -825,6 +905,13 @@
825905
remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */;
826906
sourceTree = BUILT_PRODUCTS_DIR;
827907
};
908+
ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */ = {
909+
isa = PBXReferenceProxy;
910+
fileType = archive.ar;
911+
path = libRCTBlob.a;
912+
remoteRef = ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */;
913+
sourceTree = BUILT_PRODUCTS_DIR;
914+
};
828915
/* End PBXReferenceProxy section */
829916

830917
/* Begin PBXResourcesBuildPhase section */

0 commit comments

Comments
 (0)