Skip to content

Commit 1fcfd90

Browse files
AurelGitAurelGit
authored
Merge pull request #30 from thecodingmachine/update/dependencies
Update dependencies to latest stable versions
2 parents 4327576 + 3d9c2f4 commit 1fcfd90

File tree

11 files changed

+754
-607
lines changed

11 files changed

+754
-607
lines changed

‎App/Containers/Root/RootScreen.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { Component } from 'react'
2-
import { createStackNavigator } from 'react-navigation'
2+
import { createStackNavigator, createAppContainer } from 'react-navigation'
33
import NavigationService from 'App/Services/NavigationService'
44
import { View } from 'react-native'
55
import styles from './RootScreenStyle'
@@ -30,6 +30,8 @@ const AppNav = createStackNavigator(
3030
}
3131
)
3232

33+
const App = createAppContainer(AppNav)
34+
3335
class RootScreen extends Component {
3436
componentDidMount() {
3537
// Run the startup saga when the application is starting
@@ -39,7 +41,7 @@ class RootScreen extends Component {
3941
render() {
4042
return (
4143
<View style={styles.container}>
42-
<AppNav
44+
<App
4345
// Initialize the NavigationService (see https://reactnavigation.org/docs/en/navigating-without-navigation-prop.html)
4446
ref={(navigatorRef) => {
4547
NavigationService.setTopLevelNavigator(navigatorRef)

‎App/Sagas/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
import { takeLatest } from 'redux-saga/effects'
1+
import { takeLatest, all } from 'redux-saga/effects'
22
import { ExampleTypes } from 'App/Stores/Example/Actions'
33
import { StartupTypes } from 'App/Stores/Startup/Actions'
44
import { fetchUser } from './ExampleSaga'
55
import { startup } from './StartupSaga'
66

77
export default function* root() {
8-
yield [
8+
yield all([
99
/**
1010
* @see https://redux-saga.js.org/docs/basics/UsingSagaHelpers.html
1111
*/
1212
// Run the startup saga when the application starts
1313
takeLatest(StartupTypes.STARTUP, startup),
1414
// Call `fetchUser()` when a `FETCH_USER` action is triggered
1515
takeLatest(ExampleTypes.FETCH_USER, fetchUser),
16-
]
16+
])
1717
}

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The boilerplate contains:
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
3939
- [Redux Sagas](https://redux-saga.js.org) (v5.0) to separate side-effects and logic from state and UI logic
40-
- [React Navigation](https://reactnavigation.org/) (v2.12) with a [`NavigationService`](App/Services/NavigationService.js) to handle routing and navigation in the app, with a splash screen setup by default
40+
- [React Navigation](https://reactnavigation.org/) (v3.0.9) with a [`NavigationService`](App/Services/NavigationService.js) to handle routing and navigation in the app, with a splash screen setup by default
4141
- [reduxsauce](https://github.com/infinitered/reduxsauce) (v0.7) to facilitate using Redux
4242
- [apisauce](https://github.com/infinitered/apisauce) (v0.15) to make [axios](https://github.com/axios/axios) even better
4343
- [prettier](https://prettier.io/) and [eslint](https://eslint.org/) preconfigured for React Native

‎android/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ android {
137137
}
138138

139139
dependencies {
140+
compile project(':react-native-gesture-handler')
140141
compile fileTree(dir: "libs", include: ["*.jar"])
141142
compile "com.android.support:appcompat-v7:26.0.1"
142143
compile "com.facebook.react:react-native:+" // From node_modules

‎android/app/src/main/java/com/boilerplate/MainApplication.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.app.Application;
44

55
import com.facebook.react.ReactApplication;
6+
import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
67
import com.facebook.react.ReactNativeHost;
78
import com.facebook.react.ReactPackage;
89
import com.facebook.react.shell.MainReactPackage;
@@ -22,7 +23,8 @@ public boolean getUseDeveloperSupport() {
2223
@Override
2324
protected List<ReactPackage> getPackages() {
2425
return Arrays.<ReactPackage>asList(
25-
new MainReactPackage()
26+
new MainReactPackage(),
27+
new RNGestureHandlerPackage()
2628
);
2729
}
2830

‎android/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
google()
67
}
78
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.3'
9+
classpath 'com.android.tools.build:gradle:3.1.0'
910

1011
// NOTE: Do not place your application dependencies here; they belong
1112
// in the individual module build.gradle files
@@ -23,5 +24,6 @@ allprojects {
2324
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
2425
url "$rootDir/../node_modules/react-native/android"
2526
}
27+
google()
2628
}
2729
}

‎android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

‎android/settings.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
rootProject.name = 'Boilerplate'
2+
include ':react-native-gesture-handler'
3+
project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
24

35
include ':app'

‎ios/Boilerplate.xcodeproj/project.pbxproj

Lines changed: 62 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
};
66
objectVersion = 46;
77
objects = {
8-
98
/* Begin PBXBuildFile section */
109
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
1110
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
@@ -38,6 +37,7 @@
3837
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
3938
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
4039
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
40+
EB3251F4A8874C20AF52B0AC /* libRNGestureHandler.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 83ECEED7B35A43E39016D8EF /* libRNGestureHandler.a */; };
4141
/* End PBXBuildFile section */
4242

4343
/* Begin PBXContainerItemProxy section */
@@ -343,6 +343,8 @@
343343
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
344344
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
345345
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
346+
E57D616985D64DA295E38FCD /* RNGestureHandler.xcodeproj */ = {isa = PBXFileReference; name = "RNGestureHandler.xcodeproj"; path = "../node_modules/react-native-gesture-handler/ios/RNGestureHandler.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
347+
83ECEED7B35A43E39016D8EF /* libRNGestureHandler.a */ = {isa = PBXFileReference; name = "libRNGestureHandler.a"; path = "libRNGestureHandler.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
346348
/* End PBXFileReference section */
347349

348350
/* Begin PBXFrameworksBuildPhase section */
@@ -371,6 +373,7 @@
371373
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
372374
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
373375
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
376+
EB3251F4A8874C20AF52B0AC /* libRNGestureHandler.a in Frameworks */,
374377
);
375378
runOnlyForDeploymentPostprocessing = 0;
376379
};
@@ -557,6 +560,7 @@
557560
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
558561
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
559562
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
563+
E57D616985D64DA295E38FCD /* RNGestureHandler.xcodeproj */,
560564
);
561565
name = Libraries;
562566
sourceTree = "<group>";
@@ -685,7 +689,7 @@
685689
83CBB9F71A601CBA00E9B192 /* Project object */ = {
686690
isa = PBXProject;
687691
attributes = {
688-
LastUpgradeCheck = 0610;
692+
LastUpgradeCheck = 610;
689693
ORGANIZATIONNAME = Facebook;
690694
TargetAttributes = {
691695
00E356ED1AD99517003FC87E = {
@@ -1181,6 +1185,14 @@
11811185
);
11821186
PRODUCT_NAME = "$(TARGET_NAME)";
11831187
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Boilerplate.app/Boilerplate";
1188+
LIBRARY_SEARCH_PATHS = (
1189+
"$(inherited)",
1190+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1191+
);
1192+
HEADER_SEARCH_PATHS = (
1193+
"$(inherited)",
1194+
"$(SRCROOT)\..\node_modules\react-native-gesture-handler\ios/**",
1195+
);
11841196
};
11851197
name = Debug;
11861198
};
@@ -1198,6 +1210,14 @@
11981210
);
11991211
PRODUCT_NAME = "$(TARGET_NAME)";
12001212
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Boilerplate.app/Boilerplate";
1213+
LIBRARY_SEARCH_PATHS = (
1214+
"$(inherited)",
1215+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1216+
);
1217+
HEADER_SEARCH_PATHS = (
1218+
"$(inherited)",
1219+
"$(SRCROOT)\..\node_modules\react-native-gesture-handler\ios/**",
1220+
);
12011221
};
12021222
name = Release;
12031223
};
@@ -1216,6 +1236,10 @@
12161236
);
12171237
PRODUCT_NAME = Boilerplate;
12181238
VERSIONING_SYSTEM = "apple-generic";
1239+
HEADER_SEARCH_PATHS = (
1240+
"$(inherited)",
1241+
"$(SRCROOT)\..\node_modules\react-native-gesture-handler\ios/**",
1242+
);
12191243
};
12201244
name = Debug;
12211245
};
@@ -1233,6 +1257,10 @@
12331257
);
12341258
PRODUCT_NAME = Boilerplate;
12351259
VERSIONING_SYSTEM = "apple-generic";
1260+
HEADER_SEARCH_PATHS = (
1261+
"$(inherited)",
1262+
"$(SRCROOT)\..\node_modules\react-native-gesture-handler\ios/**",
1263+
);
12361264
};
12371265
name = Release;
12381266
};
@@ -1259,6 +1287,14 @@
12591287
SDKROOT = appletvos;
12601288
TARGETED_DEVICE_FAMILY = 3;
12611289
TVOS_DEPLOYMENT_TARGET = 9.2;
1290+
LIBRARY_SEARCH_PATHS = (
1291+
"$(inherited)",
1292+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1293+
);
1294+
HEADER_SEARCH_PATHS = (
1295+
"$(inherited)",
1296+
"$(SRCROOT)\..\node_modules\react-native-gesture-handler\ios/**",
1297+
);
12621298
};
12631299
name = Debug;
12641300
};
@@ -1285,6 +1321,14 @@
12851321
SDKROOT = appletvos;
12861322
TARGETED_DEVICE_FAMILY = 3;
12871323
TVOS_DEPLOYMENT_TARGET = 9.2;
1324+
LIBRARY_SEARCH_PATHS = (
1325+
"$(inherited)",
1326+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1327+
);
1328+
HEADER_SEARCH_PATHS = (
1329+
"$(inherited)",
1330+
"$(SRCROOT)\..\node_modules\react-native-gesture-handler\ios/**",
1331+
);
12881332
};
12891333
name = Release;
12901334
};
@@ -1310,6 +1354,14 @@
13101354
SDKROOT = appletvos;
13111355
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Boilerplate-tvOS.app/Boilerplate-tvOS";
13121356
TVOS_DEPLOYMENT_TARGET = 10.1;
1357+
LIBRARY_SEARCH_PATHS = (
1358+
"$(inherited)",
1359+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1360+
);
1361+
HEADER_SEARCH_PATHS = (
1362+
"$(inherited)",
1363+
"$(SRCROOT)\..\node_modules\react-native-gesture-handler\ios/**",
1364+
);
13131365
};
13141366
name = Debug;
13151367
};
@@ -1335,6 +1387,14 @@
13351387
SDKROOT = appletvos;
13361388
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Boilerplate-tvOS.app/Boilerplate-tvOS";
13371389
TVOS_DEPLOYMENT_TARGET = 10.1;
1390+
LIBRARY_SEARCH_PATHS = (
1391+
"$(inherited)",
1392+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1393+
);
1394+
HEADER_SEARCH_PATHS = (
1395+
"$(inherited)",
1396+
"$(SRCROOT)\..\node_modules\react-native-gesture-handler\ios/**",
1397+
);
13381398
};
13391399
name = Release;
13401400
};

‎package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,19 @@
1212
"rename": "react-native-rename"
1313
},
1414
"dependencies": {
15-
"apisauce": "^0.15.2",
15+
"apisauce": "^1.0.2",
1616
"immutable": "^3.8.2",
17-
"prop-types": "^15.6.1",
17+
"prop-types": "15.6.2",
1818
"react": "16.6.3",
1919
"react-native": "0.57.8",
20-
"react-navigation": "^2.12.1",
21-
"react-redux": "^5.0.7",
22-
"redux": "^3.7.2",
23-
"redux-persist": "^5.9.1",
20+
"react-native-gesture-handler": "^1.0.15",
21+
"react-navigation": "3.1.2",
22+
"react-redux": "6.0.0",
23+
"redux": "^4.0.1",
24+
"redux-persist": "5.10.0",
2425
"redux-persist-transform-immutable": "^5.0.0",
25-
"redux-saga": "^0.16.0",
26-
"reduxsauce": "^0.7.0"
26+
"redux-saga": "^1.0.0",
27+
"reduxsauce": "^1.0.1"
2728
},
2829
"devDependencies": {
2930
"babel-core": "7.0.0-bridge.0",

0 commit comments

Comments
 (0)