Skip to content

Commit 81a3ad1

Browse files
cooperkacooperka
committed
📦 Run react-native upgrade (RN v0.49)
1 parent 9ae618d commit 81a3ad1

File tree

7 files changed

+56
-20
lines changed

7 files changed

+56
-20
lines changed

‎example/.flowconfig‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,37 @@
1212
; For RN Apps installed via npm, "Libraries" folder is inside
1313
; "node_modules/react-native" but in the source repo it is in the root
1414
.*/Libraries/react-native/React.js
15-
.*/Libraries/react-native/ReactNative.js
15+
16+
; Ignore polyfills
17+
.*/Libraries/polyfills/.*
1618

1719
[include]
1820

1921
[libs]
2022
node_modules/react-native/Libraries/react-native/react-native-interface.js
21-
node_modules/react-native/flow
22-
flow/
23+
node_modules/react-native/flow/
2324

2425
[options]
2526
emoji=true
2627

2728
module.system=haste
2829

29-
experimental.strict_type_args=true
30-
3130
munge_underscores=true
3231

3332
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
3433

3534
suppress_type=$FlowIssue
3635
suppress_type=$FlowFixMe
36+
suppress_type=$FlowFixMeProps
37+
suppress_type=$FlowFixMeState
3738
suppress_type=$FixMe
3839

39-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-5]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
40-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-5]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
40+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(5[0-3]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
41+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(5[0-3]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
4142
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
4243
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
4344

4445
unsafe.enable_getters_and_setters=true
4546

4647
[version]
47-
^0.45.0
48+
^0.53.0

‎example/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
/**

‎example/android/app/src/main/java/com/immutablelistviewexample/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

‎example/index.ios.js‎

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

‎example/index.android.js‎ renamed to ‎example/index.js‎

File renamed without changes.

‎example/ios/ImmutableListViewExample.xcodeproj/project.pbxproj‎

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
2DCD954D1E0B4F2C00145EB5 /* ImmutableListViewExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* ImmutableListViewExampleTests.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 */
@@ -228,6 +229,13 @@
228229
remoteGlobalIDString = 58B5119B1A9E6C1200147676;
229230
remoteInfo = RCTText;
230231
};
232+
ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */ = {
233+
isa = PBXContainerItemProxy;
234+
containerPortal = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */;
235+
proxyType = 2;
236+
remoteGlobalIDString = 358F4ED71D1E81A9004DF814;
237+
remoteInfo = RCTBlob;
238+
};
231239
/* End PBXContainerItemProxy section */
232240

233241
/* Begin PBXFileReference section */
@@ -255,6 +263,7 @@
255263
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
256264
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
257265
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
266+
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
258267
/* End PBXFileReference section */
259268

260269
/* Begin PBXFrameworksBuildPhase section */
@@ -270,6 +279,8 @@
270279
isa = PBXFrameworksBuildPhase;
271280
buildActionMask = 2147483647;
272281
files = (
282+
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */,
283+
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
273284
146834051AC3E58100842450 /* libReact.a in Frameworks */,
274285
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */,
275286
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
@@ -411,6 +422,7 @@
411422
3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
412423
3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
413424
3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
425+
3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */,
414426
);
415427
name = Products;
416428
sourceTree = "<group>";
@@ -439,6 +451,7 @@
439451
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */,
440452
146833FF1AC3E56700842450 /* React.xcodeproj */,
441453
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
454+
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */,
442455
00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */,
443456
00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */,
444457
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */,
@@ -471,6 +484,7 @@
471484
indentWidth = 2;
472485
sourceTree = "<group>";
473486
tabWidth = 2;
487+
usesTabs = 0;
474488
};
475489
83CBBA001A601CBA00E9B192 /* Products */ = {
476490
isa = PBXGroup;
@@ -483,6 +497,14 @@
483497
name = Products;
484498
sourceTree = "<group>";
485499
};
500+
ADBDB9201DFEBF0600ED6528 /* Products */ = {
501+
isa = PBXGroup;
502+
children = (
503+
ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */,
504+
);
505+
name = Products;
506+
sourceTree = "<group>";
507+
};
486508
/* End PBXGroup section */
487509

488510
/* Begin PBXNativeTarget section */
@@ -602,6 +624,10 @@
602624
ProductGroup = 5E91572E1DD0AC6500FF2AA8 /* Products */;
603625
ProjectRef = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */;
604626
},
627+
{
628+
ProductGroup = ADBDB9201DFEBF0600ED6528 /* Products */;
629+
ProjectRef = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */;
630+
},
605631
{
606632
ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */;
607633
ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
@@ -748,10 +774,10 @@
748774
remoteRef = 3DAD3E981DF850E9000B6D8A /* PBXContainerItemProxy */;
749775
sourceTree = BUILT_PRODUCTS_DIR;
750776
};
751-
3DAD3EA31DF850E9000B6D8A /* libReact.a */ = {
777+
3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */ = {
752778
isa = PBXReferenceProxy;
753779
fileType = archive.ar;
754-
path = libReact.a;
780+
path = "libReact-tvOS.a";
755781
remoteRef = 3DAD3EA21DF850E9000B6D8A /* PBXContainerItemProxy */;
756782
sourceTree = BUILT_PRODUCTS_DIR;
757783
};
@@ -825,6 +851,13 @@
825851
remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */;
826852
sourceTree = BUILT_PRODUCTS_DIR;
827853
};
854+
ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */ = {
855+
isa = PBXReferenceProxy;
856+
fileType = archive.ar;
857+
path = libRCTBlob.a;
858+
remoteRef = ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */;
859+
sourceTree = BUILT_PRODUCTS_DIR;
860+
};
828861
/* End PBXReferenceProxy section */
829862

830863
/* Begin PBXResourcesBuildPhase section */
@@ -874,7 +907,7 @@
874907
);
875908
runOnlyForDeploymentPostprocessing = 0;
876909
shellPath = /bin/sh;
877-
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh";
910+
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
878911
};
879912
2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = {
880913
isa = PBXShellScriptBuildPhase;
@@ -888,7 +921,7 @@
888921
);
889922
runOnlyForDeploymentPostprocessing = 0;
890923
shellPath = /bin/sh;
891-
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh";
924+
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
892925
};
893926
/* End PBXShellScriptBuildPhase section */
894927

‎example/ios/ImmutableListViewExample/AppDelegate.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
1818
{
1919
NSURL *jsCodeLocation;
2020

21-
jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index.ios" fallbackResource:nil];
21+
jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
2222

2323
RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
2424
moduleName:@"ImmutableListViewExample"

0 commit comments

Comments
 (0)