Skip to content

Commit 9cb9c8e

Browse files
skv-headlessskv-headless
committed
update example to rm 38
1 parent e4cab5c commit 9cb9c8e

File tree

7 files changed

+56
-48
lines changed

7 files changed

+56
-48
lines changed

‎examples/FacebookTabsExample/.flowconfig

Lines changed: 4 additions & 3 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
@@ -48,11 +49,11 @@ suppress_type=$FlowIssue
4849
suppress_type=$FlowFixMe
4950
suppress_type=$FixMe
5051

51-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-2]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
52-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-2]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
52+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-3]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
53+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-3]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
5354
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
5455

5556
unsafe.enable_getters_and_setters=true
5657

5758
[version]
58-
^0.32.0
59+
^0.33.0

‎examples/FacebookTabsExample/.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

‎examples/FacebookTabsExample/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,6 @@ dependencies {
135135
// Run this once to be able to run the application with BUCK
136136
// puts all compile dependencies into folder libs for BUCK to use
137137
task copyDownloadableDepsToLibs(type: Copy) {
138-
from configurations.compile
139-
into 'libs'
138+
from configurations.compile
139+
into 'libs'
140140
}

‎examples/FacebookTabsExample/android/app/src/main/java/com/facebooktabsexample/MainApplication.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.facebook.react.ReactNativeHost;
1010
import com.facebook.react.ReactPackage;
1111
import com.facebook.react.shell.MainReactPackage;
12+
import com.facebook.soloader.SoLoader;
1213

1314
import java.util.Arrays;
1415
import java.util.List;
@@ -32,6 +33,12 @@ protected List<ReactPackage> getPackages() {
3233

3334
@Override
3435
public ReactNativeHost getReactNativeHost() {
35-
return mReactNativeHost;
36+
return mReactNativeHost;
37+
}
38+
39+
@Override
40+
public void onCreate() {
41+
super.onCreate();
42+
SoLoader.init(this, /* native exopackage */ false);
3643
}
3744
}

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

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
2323
146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
2424
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
25-
584874D0FE404BA7932ACBE2 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22BDAF142981412385B745C1 /* libRNVectorIcons.a */; };
26-
671B66239FAA4384BBC93D8B /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B6123AA17F9F4089BDC1E408 /* Entypo.ttf */; };
27-
FD0CC5EF61604A9B8BC7257E /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 99ADF6673658426AAB245409 /* EvilIcons.ttf */; };
28-
79FB6310B7D74D099566C879 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EC65C9411E2D412F8D59F88C /* FontAwesome.ttf */; };
29-
2A107191981C4EB59E8246A0 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 558E1749E2A348309A32DD2F /* Foundation.ttf */; };
30-
5511C57E574A4AF79F122F12 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = AF311572B12C4A648679D921 /* Ionicons.ttf */; };
31-
E4F54E86DE0447D3A2D7679E /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1022540A5C2246DDA3042455 /* MaterialIcons.ttf */; };
32-
DEA6F8287584444B9A95433F /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 553F335B9DCD49B8A16DBEE9 /* Octicons.ttf */; };
33-
C559644653F74A619ED1A86E /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0EFF4AC03B5E44ACB751A974 /* Zocial.ttf */; };
25+
007FB3FCFC4449BB8D03A830 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C38C9023040409B89BAB61E /* libRNVectorIcons.a */; };
26+
8B92CFFA39C641EF8BCBBE13 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 09B4078555DD4760B272E0A7 /* Entypo.ttf */; };
27+
94F83075A50C434A811E73F4 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2F14162D54AB4E0A9AC681B2 /* EvilIcons.ttf */; };
28+
3F8CB16961B54F628DB211BA /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A3B220AAB0644D5D9C988437 /* FontAwesome.ttf */; };
29+
08C1ADDEB73747B3BAAE8399 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 25A324789DAD4B728F3AFE35 /* Foundation.ttf */; };
30+
7C085D0781B54FF292DDA30E /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A16EA9B66A9C49D08E47C01D /* Ionicons.ttf */; };
31+
572C882E80574ED0881F7DDC /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 768FEAF0228C4D8E9AA47854 /* MaterialIcons.ttf */; };
32+
D3C46853FC7749D39C0CDADE /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B5DD9C55A24242A0A08AA771 /* Octicons.ttf */; };
33+
B917E20BD15E4D65941A5B65 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EFDB0658781D41299E2D591B /* Zocial.ttf */; };
3434
/* End PBXBuildFile section */
3535

3636
/* Begin PBXContainerItemProxy section */
@@ -135,16 +135,16 @@
135135
146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../node_modules/react-native/React/React.xcodeproj; sourceTree = "<group>"; };
136136
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = ../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj; sourceTree = "<group>"; };
137137
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../node_modules/react-native/Libraries/Text/RCTText.xcodeproj; sourceTree = "<group>"; };
138-
9BEB862C8FCD459A9ACEB9EF /* 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; };
139-
22BDAF142981412385B745C1 /* libRNVectorIcons.a */ = {isa = PBXFileReference; name = "libRNVectorIcons.a"; path = "libRNVectorIcons.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
140-
B6123AA17F9F4089BDC1E408 /* 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; };
141-
99ADF6673658426AAB245409 /* 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; };
142-
EC65C9411E2D412F8D59F88C /* 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; };
143-
558E1749E2A348309A32DD2F /* 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; };
144-
AF311572B12C4A648679D921 /* 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; };
145-
1022540A5C2246DDA3042455 /* 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; };
146-
553F335B9DCD49B8A16DBEE9 /* 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; };
147-
0EFF4AC03B5E44ACB751A974 /* 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; };
138+
1EBBBA3F498247E98CDE2C05 /* 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; };
139+
0C38C9023040409B89BAB61E /* libRNVectorIcons.a */ = {isa = PBXFileReference; name = "libRNVectorIcons.a"; path = "libRNVectorIcons.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
140+
09B4078555DD4760B272E0A7 /* 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; };
141+
2F14162D54AB4E0A9AC681B2 /* 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; };
142+
A3B220AAB0644D5D9C988437 /* 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; };
143+
25A324789DAD4B728F3AFE35 /* 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; };
144+
A16EA9B66A9C49D08E47C01D /* 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; };
145+
768FEAF0228C4D8E9AA47854 /* 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; };
146+
B5DD9C55A24242A0A08AA771 /* 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; };
147+
EFDB0658781D41299E2D591B /* 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; };
148148
/* End PBXFileReference section */
149149

150150
/* Begin PBXFrameworksBuildPhase section */
@@ -170,7 +170,7 @@
170170
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
171171
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
172172
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
173-
584874D0FE404BA7932ACBE2 /* libRNVectorIcons.a in Frameworks */,
173+
007FB3FCFC4449BB8D03A830 /* libRNVectorIcons.a in Frameworks */,
174174
);
175175
runOnlyForDeploymentPostprocessing = 0;
176176
};
@@ -293,7 +293,7 @@
293293
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
294294
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
295295
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
296-
9BEB862C8FCD459A9ACEB9EF /* RNVectorIcons.xcodeproj */,
296+
1EBBBA3F498247E98CDE2C05 /* RNVectorIcons.xcodeproj */,
297297
);
298298
name = Libraries;
299299
sourceTree = "<group>";
@@ -313,7 +313,7 @@
313313
832341AE1AAA6A7D00B99B32 /* Libraries */,
314314
00E356EF1AD99517003FC87E /* FacebookTabsExampleTests */,
315315
83CBBA001A601CBA00E9B192 /* Products */,
316-
F74B7707A6504DCDAB3EECAF /* Resources */,
316+
76627028D2A8407F8AD3BDFD /* Resources */,
317317
);
318318
indentWidth = 2;
319319
sourceTree = "<group>";
@@ -328,17 +328,17 @@
328328
name = Products;
329329
sourceTree = "<group>";
330330
};
331-
F74B7707A6504DCDAB3EECAF /* Resources */ = {
331+
76627028D2A8407F8AD3BDFD /* Resources */ = {
332332
isa = PBXGroup;
333333
children = (
334-
B6123AA17F9F4089BDC1E408 /* Entypo.ttf */,
335-
99ADF6673658426AAB245409 /* EvilIcons.ttf */,
336-
EC65C9411E2D412F8D59F88C /* FontAwesome.ttf */,
337-
558E1749E2A348309A32DD2F /* Foundation.ttf */,
338-
AF311572B12C4A648679D921 /* Ionicons.ttf */,
339-
1022540A5C2246DDA3042455 /* MaterialIcons.ttf */,
340-
553F335B9DCD49B8A16DBEE9 /* Octicons.ttf */,
341-
0EFF4AC03B5E44ACB751A974 /* Zocial.ttf */,
334+
09B4078555DD4760B272E0A7 /* Entypo.ttf */,
335+
2F14162D54AB4E0A9AC681B2 /* EvilIcons.ttf */,
336+
A3B220AAB0644D5D9C988437 /* FontAwesome.ttf */,
337+
25A324789DAD4B728F3AFE35 /* Foundation.ttf */,
338+
A16EA9B66A9C49D08E47C01D /* Ionicons.ttf */,
339+
768FEAF0228C4D8E9AA47854 /* MaterialIcons.ttf */,
340+
B5DD9C55A24242A0A08AA771 /* Octicons.ttf */,
341+
EFDB0658781D41299E2D591B /* Zocial.ttf */,
342342
);
343343
name = Resources;
344344
path = "";
@@ -546,14 +546,14 @@
546546
files = (
547547
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
548548
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
549-
671B66239FAA4384BBC93D8B /* Entypo.ttf in Resources */,
550-
FD0CC5EF61604A9B8BC7257E /* EvilIcons.ttf in Resources */,
551-
79FB6310B7D74D099566C879 /* FontAwesome.ttf in Resources */,
552-
2A107191981C4EB59E8246A0 /* Foundation.ttf in Resources */,
553-
5511C57E574A4AF79F122F12 /* Ionicons.ttf in Resources */,
554-
E4F54E86DE0447D3A2D7679E /* MaterialIcons.ttf in Resources */,
555-
DEA6F8287584444B9A95433F /* Octicons.ttf in Resources */,
556-
C559644653F74A619ED1A86E /* Zocial.ttf in Resources */,
549+
8B92CFFA39C641EF8BCBBE13 /* Entypo.ttf in Resources */,
550+
94F83075A50C434A811E73F4 /* EvilIcons.ttf in Resources */,
551+
3F8CB16961B54F628DB211BA /* FontAwesome.ttf in Resources */,
552+
08C1ADDEB73747B3BAAE8399 /* Foundation.ttf in Resources */,
553+
7C085D0781B54FF292DDA30E /* Ionicons.ttf in Resources */,
554+
572C882E80574ED0881F7DDC /* MaterialIcons.ttf in Resources */,
555+
D3C46853FC7749D39C0CDADE /* Octicons.ttf in Resources */,
556+
B917E20BD15E4D65941A5B65 /* Zocial.ttf in Resources */,
557557
);
558558
runOnlyForDeploymentPostprocessing = 0;
559559
};

‎examples/FacebookTabsExample/ios/FacebookTabsExample/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dict>
4545
<key>localhost</key>
4646
<dict>
47-
<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
47+
<key>NSExceptionAllowsInsecureHTTPLoads</key>
4848
<true/>
4949
</dict>
5050
</dict>

‎examples/FacebookTabsExample/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
"dependencies": {
99
"react": "^15.1.0",
10-
"react-native": "^0.34.1",
10+
"react-native": "^0.38.0",
1111
"react-native-scrollable-tab-view": "../..",
1212
"react-native-vector-icons": "^2.0.3",
1313
"react-timer-mixin": "^0.13.3"

0 commit comments

Comments
 (0)