Skip to content
This repository was archived by the owner on Nov 12, 2019. It is now read-only.

Commit de58716

Browse files
wangdicoderwangdicoder
committed
upgrade react-native 0.38
1 parent 96a40b6 commit de58716

File tree

8 files changed

+123
-141
lines changed

8 files changed

+123
-141
lines changed

‎.flowconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
# Ignore unexpected extra @providesModule
1919
.*/node_modules/commoner/test/source/widget/share.js
20+
.*/node_modules/.*/node_modules/fbjs/.*
2021

2122
# Ignore duplicate module providers
2223
# For RN Apps installed via npm, "Libraries" folder is inside node_modules/react-native but in the source repo it is in the root

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ npm-debug.log
3838
buck-out/
3939
\.buckd/
4040
android/app/libs
41-
android/keystores/debug.keystore
41+
*.keystore

‎ios/GankIO.xcodeproj/project.pbxproj

Lines changed: 2 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
};
66
objectVersion = 46;
77
objects = {
8+
89
/* Begin PBXBuildFile section */
910
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
1011
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
@@ -22,16 +23,6 @@
2223
140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
2324
146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
2425
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
25-
9F254040E5BD4B118A0E6988 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 89415F321A3741778B212EB1 /* libRNVectorIcons.a */; };
26-
5EFC2F736A8F4ED5B9A4E835 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2DEA81C3B7B94CBAAB773E5C /* Entypo.ttf */; };
27-
B678E3D8D3BB49459AF2767E /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 29FBB141EA4645079454C575 /* EvilIcons.ttf */; };
28-
2802E59C2628452CBF97BCAD /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7C9B5D5F6CDE4632BD9C3C78 /* FontAwesome.ttf */; };
29-
D6CB8CF6DF8F4CE1A1C5E0F5 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6B70FA40C49348DDAD754C99 /* Foundation.ttf */; };
30-
C9997D1A00A24D9B96B5E939 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0C4C5309E6B14CBCAD6F73DA /* Ionicons.ttf */; };
31-
815C19F355E5435187A7EE9A /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C5AE16C023B748A99F06CAB5 /* MaterialIcons.ttf */; };
32-
293B32809060404DABF0615C /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F07EE5572B34469491DE5A82 /* Octicons.ttf */; };
33-
0E691B62C4F741EEBF81089D /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 75ACF09140ED41A5A89D02FA /* SimpleLineIcons.ttf */; };
34-
C5AE9A7063C44A4E9866BAC3 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 920276C1DAFB431AA3E609A0 /* Zocial.ttf */; };
3526
/* End PBXBuildFile section */
3627

3728
/* Begin PBXContainerItemProxy section */
@@ -136,17 +127,6 @@
136127
146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../node_modules/react-native/React/React.xcodeproj; sourceTree = "<group>"; };
137128
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = ../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj; sourceTree = "<group>"; };
138129
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../node_modules/react-native/Libraries/Text/RCTText.xcodeproj; sourceTree = "<group>"; };
139-
85A676C43E3C48F29F0B4BB3 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; name = "RNVectorIcons.xcodeproj"; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
140-
89415F321A3741778B212EB1 /* libRNVectorIcons.a */ = {isa = PBXFileReference; name = "libRNVectorIcons.a"; path = "libRNVectorIcons.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
141-
2DEA81C3B7B94CBAAB773E5C /* Entypo.ttf */ = {isa = PBXFileReference; name = "Entypo.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
142-
29FBB141EA4645079454C575 /* EvilIcons.ttf */ = {isa = PBXFileReference; name = "EvilIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
143-
7C9B5D5F6CDE4632BD9C3C78 /* FontAwesome.ttf */ = {isa = PBXFileReference; name = "FontAwesome.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
144-
6B70FA40C49348DDAD754C99 /* Foundation.ttf */ = {isa = PBXFileReference; name = "Foundation.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
145-
0C4C5309E6B14CBCAD6F73DA /* Ionicons.ttf */ = {isa = PBXFileReference; name = "Ionicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
146-
C5AE16C023B748A99F06CAB5 /* MaterialIcons.ttf */ = {isa = PBXFileReference; name = "MaterialIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
147-
F07EE5572B34469491DE5A82 /* Octicons.ttf */ = {isa = PBXFileReference; name = "Octicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
148-
75ACF09140ED41A5A89D02FA /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; name = "SimpleLineIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
149-
920276C1DAFB431AA3E609A0 /* Zocial.ttf */ = {isa = PBXFileReference; name = "Zocial.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
150130
/* End PBXFileReference section */
151131

152132
/* Begin PBXFrameworksBuildPhase section */
@@ -172,7 +152,6 @@
172152
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
173153
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
174154
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
175-
9F254040E5BD4B118A0E6988 /* libRNVectorIcons.a in Frameworks */,
176155
);
177156
runOnlyForDeploymentPostprocessing = 0;
178157
};
@@ -295,7 +274,6 @@
295274
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
296275
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
297276
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
298-
85A676C43E3C48F29F0B4BB3 /* RNVectorIcons.xcodeproj */,
299277
);
300278
name = Libraries;
301279
sourceTree = "<group>";
@@ -315,7 +293,6 @@
315293
832341AE1AAA6A7D00B99B32 /* Libraries */,
316294
00E356EF1AD99517003FC87E /* GankIOTests */,
317295
83CBBA001A601CBA00E9B192 /* Products */,
318-
E6D6A27AE68246BB919EB774 /* Resources */,
319296
);
320297
indentWidth = 2;
321298
sourceTree = "<group>";
@@ -330,23 +307,6 @@
330307
name = Products;
331308
sourceTree = "<group>";
332309
};
333-
E6D6A27AE68246BB919EB774 /* Resources */ = {
334-
isa = PBXGroup;
335-
children = (
336-
2DEA81C3B7B94CBAAB773E5C /* Entypo.ttf */,
337-
29FBB141EA4645079454C575 /* EvilIcons.ttf */,
338-
7C9B5D5F6CDE4632BD9C3C78 /* FontAwesome.ttf */,
339-
6B70FA40C49348DDAD754C99 /* Foundation.ttf */,
340-
0C4C5309E6B14CBCAD6F73DA /* Ionicons.ttf */,
341-
C5AE16C023B748A99F06CAB5 /* MaterialIcons.ttf */,
342-
F07EE5572B34469491DE5A82 /* Octicons.ttf */,
343-
75ACF09140ED41A5A89D02FA /* SimpleLineIcons.ttf */,
344-
920276C1DAFB431AA3E609A0 /* Zocial.ttf */,
345-
);
346-
name = Resources;
347-
path = "";
348-
sourceTree = "<group>";
349-
};
350310
/* End PBXGroup section */
351311

352312
/* Begin PBXNativeTarget section */
@@ -392,7 +352,7 @@
392352
83CBB9F71A601CBA00E9B192 /* Project object */ = {
393353
isa = PBXProject;
394354
attributes = {
395-
LastUpgradeCheck = 610;
355+
LastUpgradeCheck = 0610;
396356
ORGANIZATIONNAME = Facebook;
397357
TargetAttributes = {
398358
00E356ED1AD99517003FC87E = {
@@ -549,15 +509,6 @@
549509
files = (
550510
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
551511
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
552-
5EFC2F736A8F4ED5B9A4E835 /* Entypo.ttf in Resources */,
553-
B678E3D8D3BB49459AF2767E /* EvilIcons.ttf in Resources */,
554-
2802E59C2628452CBF97BCAD /* FontAwesome.ttf in Resources */,
555-
D6CB8CF6DF8F4CE1A1C5E0F5 /* Foundation.ttf in Resources */,
556-
C9997D1A00A24D9B96B5E939 /* Ionicons.ttf in Resources */,
557-
815C19F355E5435187A7EE9A /* MaterialIcons.ttf in Resources */,
558-
293B32809060404DABF0615C /* Octicons.ttf in Resources */,
559-
0E691B62C4F741EEBF81089D /* SimpleLineIcons.ttf in Resources */,
560-
C5AE9A7063C44A4E9866BAC3 /* Zocial.ttf in Resources */,
561512
);
562513
runOnlyForDeploymentPostprocessing = 0;
563514
};
@@ -635,10 +586,6 @@
635586
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
636587
PRODUCT_NAME = "$(TARGET_NAME)";
637588
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GankIO.app/GankIO";
638-
LIBRARY_SEARCH_PATHS = (
639-
"$(inherited)",
640-
"\"$(SRCROOT)/$(TARGET_NAME)\"",
641-
);
642589
};
643590
name = Debug;
644591
};
@@ -652,10 +599,6 @@
652599
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
653600
PRODUCT_NAME = "$(TARGET_NAME)";
654601
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GankIO.app/GankIO";
655-
LIBRARY_SEARCH_PATHS = (
656-
"$(inherited)",
657-
"\"$(SRCROOT)/$(TARGET_NAME)\"",
658-
);
659602
};
660603
name = Release;
661604
};
@@ -669,7 +612,6 @@
669612
"$(inherited)",
670613
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
671614
"$(SRCROOT)/../node_modules/react-native/React/**",
672-
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
673615
);
674616
INFOPLIST_FILE = "GankIO/Info.plist";
675617
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -692,7 +634,6 @@
692634
"$(inherited)",
693635
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
694636
"$(SRCROOT)/../node_modules/react-native/React/**",
695-
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
696637
);
697638
INFOPLIST_FILE = "GankIO/Info.plist";
698639
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -744,7 +685,6 @@
744685
"$(inherited)",
745686
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
746687
"$(SRCROOT)/../node_modules/react-native/React/**",
747-
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
748688
);
749689
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
750690
MTL_ENABLE_DEBUG_INFO = YES;
@@ -785,7 +725,6 @@
785725
"$(inherited)",
786726
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
787727
"$(SRCROOT)/../node_modules/react-native/React/**",
788-
"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
789728
);
790729
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
791730
MTL_ENABLE_DEBUG_INFO = NO;

‎ios/GankIO/Info.plist

Lines changed: 51 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,54 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict>
5-
<key>CFBundleDevelopmentRegion</key>
6-
<string>en</string>
7-
<key>CFBundleExecutable</key>
8-
<string>$(EXECUTABLE_NAME)</string>
9-
<key>CFBundleIdentifier</key>
10-
<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
11-
<key>CFBundleInfoDictionaryVersion</key>
12-
<string>6.0</string>
13-
<key>CFBundleName</key>
14-
<string>$(PRODUCT_NAME)</string>
15-
<key>CFBundlePackageType</key>
16-
<string>APPL</string>
17-
<key>CFBundleShortVersionString</key>
18-
<string>1.0</string>
19-
<key>CFBundleSignature</key>
20-
<string>????</string>
21-
<key>CFBundleVersion</key>
22-
<string>1</string>
23-
<key>LSRequiresIPhoneOS</key>
24-
<true/>
25-
<key>UILaunchStoryboardName</key>
26-
<string>LaunchScreen</string>
27-
<key>UIRequiredDeviceCapabilities</key>
28-
<array>
29-
<string>armv7</string>
30-
</array>
31-
<key>UISupportedInterfaceOrientations</key>
32-
<array>
33-
<string>UIInterfaceOrientationPortrait</string>
34-
<string>UIInterfaceOrientationLandscapeLeft</string>
35-
<string>UIInterfaceOrientationLandscapeRight</string>
36-
</array>
37-
<key>UIViewControllerBasedStatusBarAppearance</key>
38-
<false/>
39-
<key>NSLocationWhenInUseUsageDescription</key>
40-
<string/>
41-
<key>NSAppTransportSecurity</key>
42-
<dict>
43-
<key>NSExceptionDomains</key>
44-
<dict>
45-
<key>localhost</key>
46-
<dict>
47-
<key>NSExceptionAllowsInsecureHTTPLoads</key>
48-
<true/>
49-
</dict>
50-
</dict>
51-
</dict>
52-
<key>UIAppFonts</key>
53-
<array>
54-
<string>Entypo.ttf</string>
55-
<string>EvilIcons.ttf</string>
56-
<string>FontAwesome.ttf</string>
57-
<string>Foundation.ttf</string>
58-
<string>Ionicons.ttf</string>
59-
<string>MaterialIcons.ttf</string>
60-
<string>Octicons.ttf</string>
61-
<string>SimpleLineIcons.ttf</string>
62-
<string>Zocial.ttf</string>
63-
</array>
64-
</dict>
65-
</plist>
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>en</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>APPL</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleSignature</key>
20+
<string>????</string>
21+
<key>CFBundleVersion</key>
22+
<string>1</string>
23+
<key>LSRequiresIPhoneOS</key>
24+
<true/>
25+
<key>UILaunchStoryboardName</key>
26+
<string>LaunchScreen</string>
27+
<key>UIRequiredDeviceCapabilities</key>
28+
<array>
29+
<string>armv7</string>
30+
</array>
31+
<key>UISupportedInterfaceOrientations</key>
32+
<array>
33+
<string>UIInterfaceOrientationPortrait</string>
34+
<string>UIInterfaceOrientationLandscapeLeft</string>
35+
<string>UIInterfaceOrientationLandscapeRight</string>
36+
</array>
37+
<key>UIViewControllerBasedStatusBarAppearance</key>
38+
<false/>
39+
<key>NSLocationWhenInUseUsageDescription</key>
40+
<string></string>
41+
<key>NSAppTransportSecurity</key>
42+
<!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/ -->
43+
<dict>
44+
<key>NSExceptionDomains</key>
45+
<dict>
46+
<key>localhost</key>
47+
<dict>
48+
<key>NSExceptionAllowsInsecureHTTPLoads</key>
49+
<true/>
50+
</dict>
51+
</dict>
52+
</dict>
53+
</dict>
54+
</plist>

‎js/components/NavigationBar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ const styles = StyleSheet.create({
104104
paddingTop: Platform.OS === 'android' ? 0 : px2dp(6),
105105
elevation: 3,
106106
shadowColor: 'rgb(0,0,0)',
107-
shadowOffset: {height: 3, width: 1},
107+
shadowOffset: {height: 2, width: 1},
108108
shadowOpacity: 0.25,
109109
shadowRadius: 3
110110
},

‎js/containers/BackPageComponent.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ import {BackAndroid} from 'react-native';
77
export default class PageComponent extends Component{
88
constructor(props){
99
super(props);
10-
this.handleBack = this._handleBack.bind(this);
1110
}
1211

1312
componentDidMount() {
14-
BackAndroid.addEventListener('hardwareBackPress', this.handleBack);
13+
BackAndroid.addEventListener('hardwareBackPress', this._handleBack.bind(this));
1514
}
1615

1716
componentWillUnmount() {
18-
BackAndroid.removeEventListener('hardwareBackPress', this.handleBack);
17+
BackAndroid.removeEventListener('hardwareBackPress', this._handleBack.bind(this));
1918
}
2019

2120
_handleBack() {

0 commit comments

Comments
 (0)