Skip to content

Commit e1a0d88

Browse files
author
Javier Morant
authored
React Native Upgrade (#54)
* Auto stash before merge of "master" and "origin/master" Update dependencies * Fix tests * Upgrade to RN 0.54
1 parent b223eb0 commit e1a0d88

File tree

10 files changed

+804
-2343
lines changed

10 files changed

+804
-2343
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
- checkout
99
- run: yarn install
1010
- run: yarn add react@16.2.0
11-
- run: yarn add react-native@0.52.0
11+
- run: yarn add react-native@0.54.2
1212
- run: yarn add codecov
1313
- run: yarn lint
1414
- run: yarn tslint

‎examples/.flowconfig

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@
1818
; Ignore polyfills
1919
.*/Libraries/polyfills/.*
2020

21+
; Ignore metro
22+
.*/node_modules/metro/.*
23+
2124
[include]
2225

2326
[libs]
2427
node_modules/react-native/Libraries/react-native/react-native-interface.js
25-
node_modules/react-native/flow
26-
flow/
27-
flow-typed
28+
node_modules/react-native/flow/
29+
node_modules/react-native/flow-github/
2830

2931
[options]
3032
emoji=true
@@ -35,17 +37,20 @@ munge_underscores=true
3537

3638
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'
3739

40+
module.file_ext=.js
41+
module.file_ext=.jsx
42+
module.file_ext=.json
43+
module.file_ext=.native.js
44+
3845
suppress_type=$FlowIssue
3946
suppress_type=$FlowFixMe
4047
suppress_type=$FlowFixMeProps
4148
suppress_type=$FlowFixMeState
42-
suppress_type=$FixMe
4349

44-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(5[0-3]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
45-
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]+
50+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
51+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
4652
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
4753
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
4854

49-
unsafe.enable_getters_and_setters=true
50-
5155
[version]
56+
^0.65.0

‎examples/android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example"
3-
android:versionCode="1"
4-
android:versionName="1.0">
2+
package="com.example">
53

64
<uses-permission android:name="android.permission.INTERNET" />
75
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
86

9-
<uses-sdk
10-
android:minSdkVersion="16"
11-
android:targetSdkVersion="22" />
12-
137
<application
148
android:name=".MainApplication"
15-
android:allowBackup="true"
169
android:label="@string/app_name"
1710
android:icon="@mipmap/ic_launcher"
11+
android:allowBackup="false"
1812
android:theme="@style/AppTheme">
1913
<activity
2014
android:name=".MainActivity"

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

Lines changed: 62 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
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 /* exampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* exampleTests.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 */; };
@@ -110,6 +110,27 @@
110110
remoteGlobalIDString = 2D02E47A1E0B4A5D006451C7;
111111
remoteInfo = "example-tvOS";
112112
};
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+
};
113134
3DAD3E831DF850E9000B6D8A /* PBXContainerItemProxy */ = {
114135
isa = PBXContainerItemProxy;
115136
containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
@@ -260,6 +281,7 @@
260281
146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
261282
2D02E47B1E0B4A5D006451C7 /* example-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "example-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
262283
2D02E4901E0B4A5D006451C7 /* example-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "example-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
284+
2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
263285
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
264286
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
265287
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
@@ -299,8 +321,8 @@
299321
isa = PBXFrameworksBuildPhase;
300322
buildActionMask = 2147483647;
301323
files = (
302-
2D02E4C91E0B4AEC006451C7 /* libReact.a in Frameworks */,
303-
2D02E4C21E0B4AEC006451C7 /* libRCTAnimation-tvOS.a in Frameworks */,
324+
2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */,
325+
2D02E4C21E0B4AEC006451C7 /* libRCTAnimation.a in Frameworks */,
304326
2D02E4C31E0B4AEC006451C7 /* libRCTImage-tvOS.a in Frameworks */,
305327
2D02E4C41E0B4AEC006451C7 /* libRCTLinking-tvOS.a in Frameworks */,
306328
2D02E4C51E0B4AEC006451C7 /* libRCTNetwork-tvOS.a in Frameworks */,
@@ -393,6 +415,8 @@
393415
children = (
394416
139FDEF41B06529B00C62182 /* libRCTWebSocket.a */,
395417
3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */,
418+
2D16E6841FA4F8DC00B85C8A /* libfishhook.a */,
419+
2D16E6861FA4F8DC00B85C8A /* libfishhook-tvOS.a */,
396420
);
397421
name = Products;
398422
sourceTree = "<group>";
@@ -415,7 +439,6 @@
415439
isa = PBXGroup;
416440
children = (
417441
146834041AC3E56700842450 /* libReact.a */,
418-
3DAD3EA31DF850E9000B6D8A /* libReact.a */,
419442
3DAD3EA51DF850E9000B6D8A /* libyoga.a */,
420443
3DAD3EA71DF850E9000B6D8A /* libyoga.a */,
421444
3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */,
@@ -427,11 +450,19 @@
427450
name = Products;
428451
sourceTree = "<group>";
429452
};
453+
2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
454+
isa = PBXGroup;
455+
children = (
456+
2D16E6891FA4F8E400B85C8A /* libReact.a */,
457+
);
458+
name = Frameworks;
459+
sourceTree = "<group>";
460+
};
430461
5E91572E1DD0AC6500FF2AA8 /* Products */ = {
431462
isa = PBXGroup;
432463
children = (
433464
5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */,
434-
5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */,
465+
5E9157351DD0AC6500FF2AA8 /* libRCTAnimation.a */,
435466
);
436467
name = Products;
437468
sourceTree = "<group>";
@@ -480,6 +511,7 @@
480511
832341AE1AAA6A7D00B99B32 /* Libraries */,
481512
00E356EF1AD99517003FC87E /* exampleTests */,
482513
83CBBA001A601CBA00E9B192 /* Products */,
514+
2D16E6871FA4F8E400B85C8A /* Frameworks */,
483515
);
484516
indentWidth = 2;
485517
sourceTree = "<group>";
@@ -501,6 +533,7 @@
501533
isa = PBXGroup;
502534
children = (
503535
ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */,
536+
2D16E6721FA4F8DC00B85C8A /* libRCTBlob-tvOS.a */,
504537
);
505538
name = Products;
506539
sourceTree = "<group>";
@@ -732,6 +765,27 @@
732765
remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */;
733766
sourceTree = BUILT_PRODUCTS_DIR;
734767
};
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+
};
735789
3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */ = {
736790
isa = PBXReferenceProxy;
737791
fileType = archive.ar;
@@ -830,10 +884,10 @@
830884
remoteRef = 5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */;
831885
sourceTree = BUILT_PRODUCTS_DIR;
832886
};
833-
5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */ = {
887+
5E9157351DD0AC6500FF2AA8 /* libRCTAnimation.a */ = {
834888
isa = PBXReferenceProxy;
835889
fileType = archive.ar;
836-
path = "libRCTAnimation-tvOS.a";
890+
path = libRCTAnimation.a;
837891
remoteRef = 5E9157341DD0AC6500FF2AA8 /* PBXContainerItemProxy */;
838892
sourceTree = BUILT_PRODUCTS_DIR;
839893
};

‎examples/ios/example/Images.xcassets/Contents.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"version" : 1,
4+
"author" : "xcode"
5+
}
6+
}

‎examples/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
"start": "node node_modules/react-native/local-cli/cli.js start",
77
"lint": "eslint --cache .",
88
"flow": "flow",
9-
"postinstall":
10-
"rm -rf node_modules/react-native-nested-listview/{node_modules,examples}"
9+
"postinstall": "rm -rf node_modules/react-native-nested-listview/{node_modules,examples}"
1110
},
1211
"dependencies": {
13-
"react": "16.0.0",
14-
"react-native": "~0.49.3",
12+
"react": "^16.3.0-alpha.1",
13+
"react-native": "0.54.2",
1514
"react-native-nested-listview": "file:../",
1615
"react-navigation": "1.5.8",
1716
"shortid": "^2.2.8"

0 commit comments

Comments
 (0)