Skip to content

Commit 6c9c1e6

Browse files
committed
Update example dependencies
1 parent 1a7e397 commit 6c9c1e6

File tree

12 files changed

+3257
-76
lines changed

12 files changed

+3257
-76
lines changed

examples/Basic/.flowconfig

+10-24
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,18 @@
11
[ignore]
2-
3-
# We fork some components by platform.
2+
; We fork some components by platform
43
.*/*[.]android.js
54

6-
# Ignore templates with `@flow` in header
7-
.*/local-cli/generator.*
8-
9-
# Ignore malformed json
10-
.*/node_modules/y18n/test/.*\.json
11-
12-
# Ignore the website subdir
13-
<PROJECT_ROOT>/website/.*
14-
15-
# Ignore BUCK generated dirs
5+
; Ignore "BUCK" generated dirs
166
<PROJECT_ROOT>/\.buckd/
177

18-
# Ignore unexpected extra @providesModule
19-
.*/node_modules/commoner/test/source/widget/share.js
8+
; Ignore unexpected extra "@providesModule"
9+
.*/node_modules/.*/node_modules/fbjs/.*
2010

21-
# Ignore duplicate module providers
22-
# For RN Apps installed via npm, "Libraries" folder is inside node_modules/react-native but in the source repo it is in the root
11+
; Ignore duplicate module providers
12+
; For RN Apps installed via npm, "Libraries" folder is inside
13+
; "node_modules/react-native" but in the source repo it is in the root
2314
.*/Libraries/react-native/React.js
2415
.*/Libraries/react-native/ReactNative.js
25-
.*/node_modules/jest-runtime/build/__tests__/.*
2616

2717
[include]
2818

@@ -34,25 +24,21 @@ flow/
3424
[options]
3525
module.system=haste
3626

37-
esproposal.class_static_fields=enable
38-
esproposal.class_instance_fields=enable
39-
4027
experimental.strict_type_args=true
4128

4229
munge_underscores=true
4330

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

4733
suppress_type=$FlowIssue
4834
suppress_type=$FlowFixMe
4935
suppress_type=$FixMe
5036

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]+
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]+
5339
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
5440

5541
unsafe.enable_getters_and_setters=true
5642

5743
[version]
58-
^0.32.0
44+
^0.36.0

examples/Basic/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.pbxproj -text

examples/Basic/.gitignore

+15-3
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ DerivedData
2222
*.xcuserstate
2323
project.xcworkspace
2424

25-
# Android/IJ
25+
# Android/IntelliJ
2626
#
27-
*.iml
27+
build/
2828
.idea
2929
.gradle
3030
local.properties
31+
*.iml
3132

3233
# node.js
3334
#
@@ -38,4 +39,15 @@ npm-debug.log
3839
buck-out/
3940
\.buckd/
4041
android/app/libs
41-
android/keystores/debug.keystore
42+
*.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/Basic/android/app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,6 @@ dependencies {
134134
// Run this once to be able to run the application with BUCK
135135
// puts all compile dependencies into folder libs for BUCK to use
136136
task copyDownloadableDepsToLibs(type: Copy) {
137-
from configurations.compile
138-
into 'libs'
137+
from configurations.compile
138+
into 'libs'
139139
}

examples/Basic/android/app/src/main/java/com/basic/MainApplication.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.facebook.react.ReactNativeHost;
99
import com.facebook.react.ReactPackage;
1010
import com.facebook.react.shell.MainReactPackage;
11+
import com.facebook.soloader.SoLoader;
1112

1213
import java.util.Arrays;
1314
import java.util.List;
@@ -30,6 +31,12 @@ protected List<ReactPackage> getPackages() {
3031

3132
@Override
3233
public ReactNativeHost getReactNativeHost() {
33-
return mReactNativeHost;
34+
return mReactNativeHost;
35+
}
36+
37+
@Override
38+
public void onCreate() {
39+
super.onCreate();
40+
SoLoader.init(this, /* native exopackage */ false);
3441
}
3542
}

examples/Basic/ios/Basic.xcodeproj/project.pbxproj

+253-34
Large diffs are not rendered by default.

examples/Basic/ios/Basic.xcodeproj/xcshareddata/xcschemes/Basic.xcscheme

+22-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,23 @@
33
LastUpgradeVersion = "0620"
44
version = "1.3">
55
<BuildAction
6-
parallelizeBuildables = "YES"
6+
parallelizeBuildables = "NO"
77
buildImplicitDependencies = "YES">
88
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "83CBBA2D1A601D0E00E9B192"
18+
BuildableName = "libReact.a"
19+
BlueprintName = "React"
20+
ReferencedContainer = "container:../node_modules/react-native/React/React.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
923
<BuildActionEntry
1024
buildForTesting = "YES"
1125
buildForRunning = "YES"
@@ -37,10 +51,10 @@
3751
</BuildActionEntries>
3852
</BuildAction>
3953
<TestAction
54+
buildConfiguration = "Debug"
4055
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4156
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42-
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Debug">
57+
shouldUseLaunchSchemeArgsEnv = "YES">
4458
<Testables>
4559
<TestableReference
4660
skipped = "NO">
@@ -62,15 +76,18 @@
6276
ReferencedContainer = "container:Basic.xcodeproj">
6377
</BuildableReference>
6478
</MacroExpansion>
79+
<AdditionalOptions>
80+
</AdditionalOptions>
6581
</TestAction>
6682
<LaunchAction
83+
buildConfiguration = "Debug"
6784
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6885
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
6986
launchStyle = "0"
7087
useCustomWorkingDirectory = "NO"
71-
buildConfiguration = "Debug"
7288
ignoresPersistentStateOnLaunch = "NO"
7389
debugDocumentVersioning = "YES"
90+
debugServiceExtension = "internal"
7491
allowLocationSimulation = "YES">
7592
<BuildableProductRunnable
7693
runnableDebuggingMode = "0">
@@ -86,10 +103,10 @@
86103
</AdditionalOptions>
87104
</LaunchAction>
88105
<ProfileAction
106+
buildConfiguration = "Release"
89107
shouldUseLaunchSchemeArgsEnv = "YES"
90108
savedToolIdentifier = ""
91109
useCustomWorkingDirectory = "NO"
92-
buildConfiguration = "Release"
93110
debugDocumentVersioning = "YES">
94111
<BuildableProductRunnable
95112
runnableDebuggingMode = "0">

examples/Basic/ios/Basic/AppDelegate.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
#import "AppDelegate.h"
1111

12-
#import "RCTBundleURLProvider.h"
13-
#import "RCTRootView.h"
12+
#import <React/RCTBundleURLProvider.h>
13+
#import <React/RCTRootView.h>
1414

1515
@implementation AppDelegate
1616

examples/Basic/ios/Basic/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dict>
4646
<key>localhost</key>
4747
<dict>
48-
<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
48+
<key>NSExceptionAllowsInsecureHTTPLoads</key>
4949
<true/>
5050
</dict>
5151
</dict>

examples/Basic/ios/BasicTests/BasicTests.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#import <UIKit/UIKit.h>
1111
#import <XCTest/XCTest.h>
1212

13-
#import "RCTLog.h"
14-
#import "RCTRootView.h"
13+
#import <React/RCTLog.h>
14+
#import <React/RCTRootView.h>
1515

1616
#define TIMEOUT_SECONDS 600
1717
#define TEXT_TO_LOOK_FOR @"Welcome to React Native!"

examples/Basic/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"start": "node node_modules/react-native/local-cli/cli.js start"
77
},
88
"dependencies": {
9-
"react": "15.3.2",
10-
"react-native": "0.35.0",
9+
"react": "~15.4.0-rc.4",
10+
"react-native": "0.40.0",
1111
"react-native-sortable-list": "*"
1212
}
1313
}

0 commit comments

Comments
 (0)