Skip to content
This repository was archived by the owner on Jun 10, 2022. It is now read-only.

Commit 2d7c457

Browse files
hzalazhzalaz
committed
Merge pull request #4 from auth0/chore-update-to-react-native-0.17
Update react-native lib and project to v0.17
2 parents 7153ff4 + cff4000 commit 2d7c457

File tree

6 files changed

+40
-16
lines changed

6 files changed

+40
-16
lines changed

‎android/LockReact/.flowconfig

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,24 @@
77
# Some modules have their own node_modules with overlap
88
.*/node_modules/node-haste/.*
99

10-
# Ignore react-tools where there are overlaps, but don't ignore anything that
11-
# react-native relies on
12-
.*/node_modules/react-tools/src/React.js
13-
.*/node_modules/react-tools/src/renderers/shared/event/EventPropagators.js
14-
.*/node_modules/react-tools/src/renderers/shared/event/eventPlugins/ResponderEventPlugin.js
15-
.*/node_modules/react-tools/src/shared/vendor/core/ExecutionEnvironment.js
10+
# Ugh
11+
.*/node_modules/babel.*
12+
.*/node_modules/babylon.*
13+
.*/node_modules/invariant.*
14+
15+
# Ignore react and fbjs where there are overlaps, but don't ignore
16+
# anything that react-native relies on
17+
.*/node_modules/fbjs-haste/.*/__tests__/.*
18+
.*/node_modules/fbjs-haste/__forks__/Map.js
19+
.*/node_modules/fbjs-haste/__forks__/Promise.js
20+
.*/node_modules/fbjs-haste/__forks__/fetch.js
21+
.*/node_modules/fbjs-haste/core/ExecutionEnvironment.js
22+
.*/node_modules/fbjs-haste/core/isEmpty.js
23+
.*/node_modules/fbjs-haste/crypto/crc32.js
24+
.*/node_modules/fbjs-haste/stubs/ErrorUtils.js
25+
.*/node_modules/react-haste/React.js
26+
.*/node_modules/react-haste/renderers/dom/ReactDOM.js
27+
.*/node_modules/react-haste/renderers/shared/event/eventPlugins/ResponderEventPlugin.js
1628

1729
# Ignore commoner tests
1830
.*/node_modules/commoner/test/.*
@@ -43,9 +55,9 @@ suppress_type=$FlowIssue
4355
suppress_type=$FlowFixMe
4456
suppress_type=$FixMe
4557

46-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(1[0-8]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
47-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(1[0-8]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)? #[0-9]+
58+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
59+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)? #[0-9]+
4860
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
4961

5062
[version]
51-
0.18.1
63+
0.19.0

‎android/LockReact/android/app/react.gradle

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.apache.tools.ant.taskdefs.condition.Os
2+
13
def config = project.hasProperty("react") ? project.react : [];
24

35
def bundleAssetName = config.bundleAssetName ?: "index.android.bundle"
@@ -36,8 +38,13 @@ task bundleDebugJsAndAssets(type: Exec) {
3638

3739
// set up the call to the react-native cli
3840
workingDir reactRoot
39-
commandLine "react-native", "bundle", "--platform", "android", "--dev", "true", "--entry-file",
41+
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
42+
commandLine "cmd", "/c", "react-native", "bundle", "--platform", "android", "--dev", "true", "--entry-file",
43+
entryFile, "--bundle-output", jsBundleFileDebug, "--assets-dest", resourcesDirDebug
44+
} else {
45+
commandLine "react-native", "bundle", "--platform", "android", "--dev", "true", "--entry-file",
4046
entryFile, "--bundle-output", jsBundleFileDebug, "--assets-dest", resourcesDirDebug
47+
}
4148

4249
enabled config.bundleInDebug ?: false
4350
}
@@ -56,8 +63,13 @@ task bundleReleaseJsAndAssets(type: Exec) {
5663

5764
// set up the call to the react-native cli
5865
workingDir reactRoot
59-
commandLine "react-native", "bundle", "--platform", "android", "--dev", "false", "--entry-file",
66+
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
67+
commandLine "cmd","/c", "react-native", "bundle", "--platform", "android", "--dev", "false", "--entry-file",
6068
entryFile, "--bundle-output", jsBundleFileRelease, "--assets-dest", resourcesDirRelease
69+
} else {
70+
commandLine "react-native", "bundle", "--platform", "android", "--dev", "false", "--entry-file",
71+
entryFile, "--bundle-output", jsBundleFileRelease, "--assets-dest", resourcesDirRelease
72+
}
6173

6274
enabled config.bundleInRelease ?: true
6375
}

‎android/LockReact/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ allprojects {
2020
}
2121

2222
ext.libraries = [
23-
app_compat: 'com.android.support:appcompat-v7:23.1.1',
24-
react_native: 'com.facebook.react:react-native:0.16.+',
23+
app_compat: 'com.android.support:appcompat-v7:23.0.1',
24+
react_native: 'com.facebook.react:react-native:0.17.+',
2525
testing: [
2626
dependencies.create('junit:junit:4.11') {
2727
exclude module: 'hamcrest-core'

‎android/LockReact/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
1919

20-
android.useDeprecatedNdk=true
20+
android.useDeprecatedNdk=true

‎android/LockReact/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"start": "react-native start"
77
},
88
"dependencies": {
9-
"react-native": "^0.16.0",
9+
"react-native": "^0.17.0",
1010
"react-native-lock-android": "file:../../"
1111
}
1212
}

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"passwordless"
2323
],
2424
"peerDependencies": {
25-
"react-native": "^0.16.0"
25+
"react-native": "^0.17.0"
2626
},
2727
"author": "Auth0",
2828
"license": "MIT",

0 commit comments

Comments
 (0)