Skip to content

Commit a04d3a3

Browse files
authored
Merge pull request #2 from thecodingmachine/react-native-0.57
Upgrade to React Native 0.57
2 parents 410850c + b3a36bc commit a04d3a3

File tree

7 files changed

+1252
-1377
lines changed

7 files changed

+1252
-1377
lines changed

.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"presets": ["react-native"]
2+
"presets": ["module:metro-react-native-babel-preset"]
33
}

App/Theme/Fonts.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
const type = {
2-
base: 'inherit',
3-
}
4-
51
const size = {
62
h1: 38,
73
h2: 34,
@@ -14,25 +10,20 @@ const size = {
1410

1511
const style = {
1612
h1: {
17-
fontFamily: type.base,
1813
fontSize: size.h1,
1914
},
2015
h2: {
21-
fontFamily: type.base,
2216
fontSize: size.h2,
2317
},
2418
h3: {
25-
fontFamily: type.base,
2619
fontSize: size.h3,
2720
},
2821
normal: {
29-
fontFamily: type.base,
3022
fontSize: size.regular,
3123
},
3224
}
3325

3426
export default {
35-
type,
3627
size,
3728
style,
3829
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ The driving goal of the architecture of the boilerplate is separation of concern
3232

3333
The boilerplate contains:
3434

35-
- a [React Native](https://facebook.github.io/react-native/) application (in "[ejected](https://github.com/react-community/create-react-native-app/blob/master/EJECTING.md)" mode to allow using dependencies that rely on native code)
35+
- a [React Native](https://facebook.github.io/react-native/) (v0.57.1) application (in "[ejected](https://github.com/react-community/create-react-native-app/blob/master/EJECTING.md)" mode to allow using dependencies that rely on native code)
3636
- a [clear directory layout](#directory-layout) to provide a base architecture for your application
3737
- [Redux](https://redux.js.org/) (v3.7) to help manage state
3838
- [Redux Persist](https://github.com/rt2zz/redux-persist) (v5.9) to persist the Redux state

android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ def enableSeparateBuildPerCPUArchitecture = false
9494
def enableProguardInReleaseBuilds = false
9595

9696
android {
97-
compileSdkVersion 23
98-
buildToolsVersion "23.0.1"
97+
compileSdkVersion 26
98+
buildToolsVersion "26.0.1"
9999

100100
defaultConfig {
101101
applicationId "com.boilerplate"
@@ -138,7 +138,7 @@ android {
138138

139139
dependencies {
140140
compile fileTree(dir: "libs", include: ["*.jar"])
141-
compile "com.android.support:appcompat-v7:23.0.1"
141+
compile "com.android.support:appcompat-v7:26.0.1"
142142
compile "com.facebook.react:react-native:+" // From node_modules
143143
}
144144

android/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ allprojects {
1616
repositories {
1717
mavenLocal()
1818
jcenter()
19+
maven {
20+
url 'https://maven.google.com'
21+
}
1922
maven {
2023
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
2124
url "$rootDir/../node_modules/react-native/android"

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"apisauce": "^0.15.2",
1616
"immutable": "^3.8.2",
1717
"prop-types": "^15.6.1",
18-
"react": "16.3.1",
19-
"react-native": "0.55.4",
18+
"react": "16.5.0",
19+
"react-native": "0.57.1",
2020
"react-navigation": "^2.12.1",
2121
"react-redux": "^5.0.7",
2222
"redux": "^3.7.2",
@@ -26,8 +26,9 @@
2626
"reduxsauce": "^0.7.0"
2727
},
2828
"devDependencies": {
29+
"babel-core": "7.0.0-bridge.0",
2930
"babel-jest": "23.2.0",
30-
"babel-preset-react-native": "4.0.0",
31+
"metro-react-native-babel-preset": "^0.45.0",
3132
"eslint": "^4.19.1",
3233
"eslint-config-prettier": "^2.9.0",
3334
"eslint-config-standard": "^11.0.0",

0 commit comments

Comments
 (0)