Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Commit ec5dba7

Browse files
Vladimir Kotikovbuptkang
Vladimir Kotikov
authored and
buptkang
committed
Upgrade example app to react-native 0.40.0 (#638)
* Update sample to [email protected] * Update compatibility with latest react-native * Fixed Merge Issues with CodePushDemoApp.xcscheme
1 parent 90f0bb8 commit ec5dba7

File tree

14 files changed

+279
-30
lines changed

14 files changed

+279
-30
lines changed

‎Examples/CodePushDemoApp/.flowconfig

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,17 @@ experimental.strict_type_args=true
2828

2929
munge_underscores=true
3030

31-
module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
3231
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'
3332

3433
suppress_type=$FlowIssue
3534
suppress_type=$FlowFixMe
3635
suppress_type=$FixMe
3736

38-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-5]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
39-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-5]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
37+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-6]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
38+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-6]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
4039
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
4140

4241
unsafe.enable_getters_and_setters=true
4342

4443
[version]
45-
^0.35.0
44+
^0.36.0

‎Examples/CodePushDemoApp/.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,14 @@ buck-out/
4040
\.buckd/
4141
android/app/libs
4242
*.keystore
43+
44+
# fastlane
45+
#
46+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
47+
# screenshots whenever they are needed.
48+
# For more information about the recommended setup visit:
49+
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
50+
51+
fastlane/report.xml
52+
fastlane/Preview.html
53+
fastlane/screenshots

‎Examples/CodePushDemoApp/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ android {
9292
minSdkVersion 16
9393
targetSdkVersion 22
9494
versionCode 1
95-
versionName "1.0.0"
95+
versionName "1.0"
9696
ndk {
9797
abiFilters "armeabi-v7a", "x86"
9898
}

‎Examples/CodePushDemoApp/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.codepushdemoapp"
33
android:versionCode="1"
4-
android:versionName="1.0.0">
4+
android:versionName="1.0">
55

66
<uses-permission android:name="android.permission.INTERNET" />
77
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

‎Examples/CodePushDemoApp/android/app/src/main/java/com/codepushdemoapp/MainApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected List<ReactPackage> getPackages() {
3939
public ReactNativeHost getReactNativeHost() {
4040
return mReactNativeHost;
4141
}
42-
42+
4343
@Override
4444
public void onCreate() {
4545
super.onCreate();

‎Examples/CodePushDemoApp/iOS/CodePushDemoApp.xcodeproj/project.pbxproj

Lines changed: 195 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,97 @@
9292
remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192;
9393
remoteInfo = React;
9494
};
95+
3DAD3E831DF850E9000B6D8A /* PBXContainerItemProxy */ = {
96+
isa = PBXContainerItemProxy;
97+
containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
98+
proxyType = 2;
99+
remoteGlobalIDString = 2D2A283A1D9B042B00D4039D;
100+
remoteInfo = "RCTImage-tvOS";
101+
};
102+
3DAD3E871DF850E9000B6D8A /* PBXContainerItemProxy */ = {
103+
isa = PBXContainerItemProxy;
104+
containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */;
105+
proxyType = 2;
106+
remoteGlobalIDString = 2D2A28471D9B043800D4039D;
107+
remoteInfo = "RCTLinking-tvOS";
108+
};
109+
3DAD3E8B1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
110+
isa = PBXContainerItemProxy;
111+
containerPortal = 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */;
112+
proxyType = 2;
113+
remoteGlobalIDString = 2D2A28541D9B044C00D4039D;
114+
remoteInfo = "RCTNetwork-tvOS";
115+
};
116+
3DAD3E8F1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
117+
isa = PBXContainerItemProxy;
118+
containerPortal = 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */;
119+
proxyType = 2;
120+
remoteGlobalIDString = 2D2A28611D9B046600D4039D;
121+
remoteInfo = "RCTSettings-tvOS";
122+
};
123+
3DAD3E931DF850E9000B6D8A /* PBXContainerItemProxy */ = {
124+
isa = PBXContainerItemProxy;
125+
containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */;
126+
proxyType = 2;
127+
remoteGlobalIDString = 2D2A287B1D9B048500D4039D;
128+
remoteInfo = "RCTText-tvOS";
129+
};
130+
3DAD3E981DF850E9000B6D8A /* PBXContainerItemProxy */ = {
131+
isa = PBXContainerItemProxy;
132+
containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
133+
proxyType = 2;
134+
remoteGlobalIDString = 2D2A28881D9B049200D4039D;
135+
remoteInfo = "RCTWebSocket-tvOS";
136+
};
137+
3DAD3EA21DF850E9000B6D8A /* PBXContainerItemProxy */ = {
138+
isa = PBXContainerItemProxy;
139+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
140+
proxyType = 2;
141+
remoteGlobalIDString = 2D2A28131D9B038B00D4039D;
142+
remoteInfo = "React-tvOS";
143+
};
144+
3DAD3EA41DF850E9000B6D8A /* PBXContainerItemProxy */ = {
145+
isa = PBXContainerItemProxy;
146+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
147+
proxyType = 2;
148+
remoteGlobalIDString = 3D3C059A1DE3340900C268FA;
149+
remoteInfo = yoga;
150+
};
151+
3DAD3EA61DF850E9000B6D8A /* PBXContainerItemProxy */ = {
152+
isa = PBXContainerItemProxy;
153+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
154+
proxyType = 2;
155+
remoteGlobalIDString = 3D3C06751DE3340C00C268FA;
156+
remoteInfo = "yoga-tvOS";
157+
};
158+
3DAD3EA81DF850E9000B6D8A /* PBXContainerItemProxy */ = {
159+
isa = PBXContainerItemProxy;
160+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
161+
proxyType = 2;
162+
remoteGlobalIDString = 3D3CD9251DE5FBEC00167DC4;
163+
remoteInfo = cxxreact;
164+
};
165+
3DAD3EAA1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
166+
isa = PBXContainerItemProxy;
167+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
168+
proxyType = 2;
169+
remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4;
170+
remoteInfo = "cxxreact-tvOS";
171+
};
172+
3DAD3EAC1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
173+
isa = PBXContainerItemProxy;
174+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
175+
proxyType = 2;
176+
remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4;
177+
remoteInfo = jschelpers;
178+
};
179+
3DAD3EAE1DF850E9000B6D8A /* PBXContainerItemProxy */ = {
180+
isa = PBXContainerItemProxy;
181+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
182+
proxyType = 2;
183+
remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4;
184+
remoteInfo = "jschelpers-tvOS";
185+
};
95186
549D09CC1D528CDB00C95E36 /* PBXContainerItemProxy */ = {
96187
isa = PBXContainerItemProxy;
97188
containerPortal = 549D09C81D528CDB00C95E36 /* CodePush.xcodeproj */;
@@ -208,6 +299,7 @@
208299
isa = PBXGroup;
209300
children = (
210301
00C302C01ABCB91800DB3ED1 /* libRCTImage.a */,
302+
3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */,
211303
);
212304
name = Products;
213305
sourceTree = "<group>";
@@ -216,6 +308,7 @@
216308
isa = PBXGroup;
217309
children = (
218310
00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */,
311+
3DAD3E8C1DF850E9000B6D8A /* libRCTNetwork-tvOS.a */,
219312
);
220313
name = Products;
221314
sourceTree = "<group>";
@@ -249,6 +342,7 @@
249342
isa = PBXGroup;
250343
children = (
251344
139105C11AF99BAD00B5F7CC /* libRCTSettings.a */,
345+
3DAD3E901DF850E9000B6D8A /* libRCTSettings-tvOS.a */,
252346
);
253347
name = Products;
254348
sourceTree = "<group>";
@@ -257,6 +351,7 @@
257351
isa = PBXGroup;
258352
children = (
259353
139FDEF41B06529B00C62182 /* libRCTWebSocket.a */,
354+
3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */,
260355
);
261356
name = Products;
262357
sourceTree = "<group>";
@@ -279,6 +374,13 @@
279374
isa = PBXGroup;
280375
children = (
281376
146834041AC3E56700842450 /* libReact.a */,
377+
3DAD3EA31DF850E9000B6D8A /* libReact.a */,
378+
3DAD3EA51DF850E9000B6D8A /* libyoga.a */,
379+
3DAD3EA71DF850E9000B6D8A /* libyoga.a */,
380+
3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */,
381+
3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
382+
3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
383+
3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
282384
);
283385
name = Products;
284386
sourceTree = "<group>";
@@ -297,6 +399,7 @@
297399
isa = PBXGroup;
298400
children = (
299401
78C398B91ACF4ADC00677621 /* libRCTLinking.a */,
402+
3DAD3E881DF850E9000B6D8A /* libRCTLinking-tvOS.a */,
300403
);
301404
name = Products;
302405
sourceTree = "<group>";
@@ -324,6 +427,7 @@
324427
isa = PBXGroup;
325428
children = (
326429
832341B51AAA6A8300B99B32 /* libRCTText.a */,
430+
3DAD3E941DF850E9000B6D8A /* libRCTText-tvOS.a */,
327431
);
328432
name = Products;
329433
sourceTree = "<group>";
@@ -530,13 +634,104 @@
530634
remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */;
531635
sourceTree = BUILT_PRODUCTS_DIR;
532636
};
637+
3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */ = {
638+
isa = PBXReferenceProxy;
639+
fileType = archive.ar;
640+
path = "libRCTImage-tvOS.a";
641+
remoteRef = 3DAD3E831DF850E9000B6D8A /* PBXContainerItemProxy */;
642+
sourceTree = BUILT_PRODUCTS_DIR;
643+
};
533644
549D09CD1D528CDB00C95E36 /* libCodePush.a */ = {
534645
isa = PBXReferenceProxy;
535646
fileType = archive.ar;
536647
path = libCodePush.a;
537648
remoteRef = 549D09CC1D528CDB00C95E36 /* PBXContainerItemProxy */;
538649
sourceTree = BUILT_PRODUCTS_DIR;
539650
};
651+
3DAD3E881DF850E9000B6D8A /* libRCTLinking-tvOS.a */ = {
652+
isa = PBXReferenceProxy;
653+
fileType = archive.ar;
654+
path = "libRCTLinking-tvOS.a";
655+
remoteRef = 3DAD3E871DF850E9000B6D8A /* PBXContainerItemProxy */;
656+
sourceTree = BUILT_PRODUCTS_DIR;
657+
};
658+
3DAD3E8C1DF850E9000B6D8A /* libRCTNetwork-tvOS.a */ = {
659+
isa = PBXReferenceProxy;
660+
fileType = archive.ar;
661+
path = "libRCTNetwork-tvOS.a";
662+
remoteRef = 3DAD3E8B1DF850E9000B6D8A /* PBXContainerItemProxy */;
663+
sourceTree = BUILT_PRODUCTS_DIR;
664+
};
665+
3DAD3E901DF850E9000B6D8A /* libRCTSettings-tvOS.a */ = {
666+
isa = PBXReferenceProxy;
667+
fileType = archive.ar;
668+
path = "libRCTSettings-tvOS.a";
669+
remoteRef = 3DAD3E8F1DF850E9000B6D8A /* PBXContainerItemProxy */;
670+
sourceTree = BUILT_PRODUCTS_DIR;
671+
};
672+
3DAD3E941DF850E9000B6D8A /* libRCTText-tvOS.a */ = {
673+
isa = PBXReferenceProxy;
674+
fileType = archive.ar;
675+
path = "libRCTText-tvOS.a";
676+
remoteRef = 3DAD3E931DF850E9000B6D8A /* PBXContainerItemProxy */;
677+
sourceTree = BUILT_PRODUCTS_DIR;
678+
};
679+
3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */ = {
680+
isa = PBXReferenceProxy;
681+
fileType = archive.ar;
682+
path = "libRCTWebSocket-tvOS.a";
683+
remoteRef = 3DAD3E981DF850E9000B6D8A /* PBXContainerItemProxy */;
684+
sourceTree = BUILT_PRODUCTS_DIR;
685+
};
686+
3DAD3EA31DF850E9000B6D8A /* libReact.a */ = {
687+
isa = PBXReferenceProxy;
688+
fileType = archive.ar;
689+
path = libReact.a;
690+
remoteRef = 3DAD3EA21DF850E9000B6D8A /* PBXContainerItemProxy */;
691+
sourceTree = BUILT_PRODUCTS_DIR;
692+
};
693+
3DAD3EA51DF850E9000B6D8A /* libyoga.a */ = {
694+
isa = PBXReferenceProxy;
695+
fileType = archive.ar;
696+
path = libyoga.a;
697+
remoteRef = 3DAD3EA41DF850E9000B6D8A /* PBXContainerItemProxy */;
698+
sourceTree = BUILT_PRODUCTS_DIR;
699+
};
700+
3DAD3EA71DF850E9000B6D8A /* libyoga.a */ = {
701+
isa = PBXReferenceProxy;
702+
fileType = archive.ar;
703+
path = libyoga.a;
704+
remoteRef = 3DAD3EA61DF850E9000B6D8A /* PBXContainerItemProxy */;
705+
sourceTree = BUILT_PRODUCTS_DIR;
706+
};
707+
3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */ = {
708+
isa = PBXReferenceProxy;
709+
fileType = archive.ar;
710+
path = libcxxreact.a;
711+
remoteRef = 3DAD3EA81DF850E9000B6D8A /* PBXContainerItemProxy */;
712+
sourceTree = BUILT_PRODUCTS_DIR;
713+
};
714+
3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */ = {
715+
isa = PBXReferenceProxy;
716+
fileType = archive.ar;
717+
path = libcxxreact.a;
718+
remoteRef = 3DAD3EAA1DF850E9000B6D8A /* PBXContainerItemProxy */;
719+
sourceTree = BUILT_PRODUCTS_DIR;
720+
};
721+
3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */ = {
722+
isa = PBXReferenceProxy;
723+
fileType = archive.ar;
724+
path = libjschelpers.a;
725+
remoteRef = 3DAD3EAC1DF850E9000B6D8A /* PBXContainerItemProxy */;
726+
sourceTree = BUILT_PRODUCTS_DIR;
727+
};
728+
3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */ = {
729+
isa = PBXReferenceProxy;
730+
fileType = archive.ar;
731+
path = libjschelpers.a;
732+
remoteRef = 3DAD3EAE1DF850E9000B6D8A /* PBXContainerItemProxy */;
733+
sourceTree = BUILT_PRODUCTS_DIR;
734+
};
540735
5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */ = {
541736
isa = PBXReferenceProxy;
542737
fileType = archive.ar;
@@ -750,11 +945,6 @@
750945
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
751946
GCC_WARN_UNUSED_FUNCTION = YES;
752947
GCC_WARN_UNUSED_VARIABLE = YES;
753-
HEADER_SEARCH_PATHS = (
754-
"$(inherited)",
755-
"$(SRCROOT)/../node_modules/react-native/React/**",
756-
"$(SRCROOT)/../node_modules/react-native/ReactCommon/**",
757-
);
758948
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
759949
MTL_ENABLE_DEBUG_INFO = YES;
760950
ONLY_ACTIVE_ARCH = YES;
@@ -790,11 +980,6 @@
790980
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
791981
GCC_WARN_UNUSED_FUNCTION = YES;
792982
GCC_WARN_UNUSED_VARIABLE = YES;
793-
HEADER_SEARCH_PATHS = (
794-
"$(inherited)",
795-
"$(SRCROOT)/../node_modules/react-native/React/**",
796-
"$(SRCROOT)/../node_modules/react-native/ReactCommon/**",
797-
);
798983
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
799984
MTL_ENABLE_DEBUG_INFO = NO;
800985
SDKROOT = iphoneos;

0 commit comments

Comments
 (0)