Skip to content

Commit 255fb9b

Browse files
ryerye
committed
Merge branch 'master' into greenkeeper/bugsnag-react-native-2.9.5
Signed-off-by: Kristofer Rye <[email protected]> Tested-by: Kristofer Rye <[email protected]>
2 parents 0086110 + 4b90014 commit 255fb9b

File tree

15 files changed

+972
-405
lines changed

15 files changed

+972
-405
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
- run: yarn install --frozen-lockfile
154154
- run: mkdir -p logs/ test-results/jest/
155155
- run: yarn run bundle-data
156-
- run: yarn run --silent test --coverage --testResultsProcessor="jest-junit" 2>&1 | tee logs/jest
156+
- run: yarn run --silent test --coverage | tee logs/jest
157157
- run: *run-danger
158158
- store_test_results:
159159
path: ./test-results

‎Gemfile.lock‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ GEM
1919
dotenv (2.4.0)
2020
emoji_regex (0.1.1)
2121
excon (0.62.0)
22-
faraday (0.15.0)
22+
faraday (0.15.2)
2323
multipart-post (>= 1.2, < 3)
2424
faraday-cookie_jar (0.0.6)
2525
faraday (>= 0.7.4)
2626
http-cookie (~> 1.0.0)
2727
faraday_middleware (0.12.2)
2828
faraday (>= 0.7.4, < 1.0)
29-
fastimage (2.1.1)
30-
fastlane (2.93.1)
29+
fastimage (2.1.3)
30+
fastlane (2.97.0)
3131
CFPropertyList (>= 2.3, < 4.0.0)
3232
addressable (>= 2.3, < 3.0.0)
3333
babosa (>= 1.0.2, < 2.0.0)
@@ -42,7 +42,7 @@ GEM
4242
faraday_middleware (~> 0.9)
4343
fastimage (>= 2.1.0, < 3.0.0)
4444
gh_inspector (>= 1.1.2, < 2.0.0)
45-
google-api-client (>= 0.13.1, < 0.14.0)
45+
google-api-client (>= 0.21.2, < 0.22.0)
4646
highline (>= 1.7.2, < 2.0.0)
4747
json (< 3.0.0)
4848
mini_magick (~> 4.5.1)
@@ -51,7 +51,7 @@ GEM
5151
multipart-post (~> 2.0.0)
5252
plist (>= 3.1.0, < 4.0.0)
5353
public_suffix (~> 2.0.0)
54-
rubyzip (>= 1.1.0, < 2.0.0)
54+
rubyzip (>= 1.2.1, < 2.0.0)
5555
security (= 0.1.3)
5656
simctl (~> 1.6.3)
5757
slack-notifier (>= 2.0.0, < 3.0.0)
@@ -67,10 +67,10 @@ GEM
6767
git
6868
xml-simple
6969
gh_inspector (1.1.3)
70-
git (1.3.0)
71-
google-api-client (0.13.6)
70+
git (1.4.0)
71+
google-api-client (0.21.2)
7272
addressable (~> 2.5, >= 2.5.1)
73-
googleauth (~> 0.5)
73+
googleauth (>= 0.5, < 0.7.0)
7474
httpclient (>= 2.8.1, < 3.0)
7575
mime-types (~> 3.0)
7676
representable (~> 3.0)
@@ -102,7 +102,7 @@ GEM
102102
multi_xml (0.6.0)
103103
multipart-post (2.0.0)
104104
nanaimo (0.2.5)
105-
naturally (2.1.0)
105+
naturally (2.2.0)
106106
os (0.9.6)
107107
parallel (1.12.1)
108108
parser (2.5.1.0)
@@ -149,14 +149,14 @@ GEM
149149
unf (0.1.4)
150150
unf_ext
151151
unf_ext (0.0.7.5)
152-
unicode-display_width (1.3.2)
152+
unicode-display_width (1.4.0)
153153
word_wrap (1.0.0)
154-
xcodeproj (1.5.7)
154+
xcodeproj (1.5.9)
155155
CFPropertyList (>= 2.3.3, < 4.0)
156156
atomos (~> 0.1.2)
157157
claide (>= 1.0.2, < 2.0)
158158
colored2 (~> 3.1)
159-
nanaimo (~> 0.2.4)
159+
nanaimo (~> 0.2.5)
160160
xcpretty (0.2.8)
161161
rouge (~> 2.0.7)
162162
xcpretty-travis-formatter (1.0.0)
@@ -173,6 +173,5 @@ DEPENDENCIES
173173
rubocop (~> 0.51.0)
174174
xcodeproj
175175

176-
177176
BUNDLED WITH
178177
1.16.1

‎package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
"transformIgnorePatterns": [
5656
"node_modules/(?!(jest-)?react-native|glamorous-native)"
5757
],
58+
"testEnvironment": "node",
5859
"preset": "react-native"
5960
},
6061
"prettier": {
@@ -81,14 +82,14 @@
8182
"bugsnag-react-native": "2.9.5",
8283
"css-select": "2.0.0",
8384
"delay": "3.0.0",
84-
"events": "2.0.0",
85+
"events": "3.0.0",
8586
"get-urls": "7.2.0",
8687
"glamorous-native": "1.4.0",
8788
"html-entities": "1.2.1",
8889
"htmlparser2": "3.9.2",
8990
"keyword-search": "0.1.1",
90-
"lodash": "4.17.9",
91-
"moment": "2.22.1",
91+
"lodash": "4.17.10",
92+
"moment": "2.22.2",
9293
"moment-timezone": "0.5.17",
9394
"p-props": "1.2.0",
9495
"p-retry": "2.0.0",
@@ -97,7 +98,7 @@
9798
"react-markdown": "2.5.1",
9899
"react-native": "0.55.4",
99100
"react-native-button": "2.3.0",
100-
"react-native-calendar-events": "1.5.0",
101+
"react-native-calendar-events": "1.6.0",
101102
"react-native-communications": "2.2.1",
102103
"react-native-custom-tabs": "0.1.7",
103104
"react-native-device-info": "0.21.5",
@@ -107,13 +108,13 @@
107108
"react-native-network-info": "3.2.2",
108109
"react-native-restart": "0.0.6",
109110
"react-native-safari-view": "2.1.0",
110-
"react-native-search-bar": "3.4.1",
111+
"react-native-search-bar": "3.4.2",
111112
"react-native-searchbar": "https://github.com/MosesEsan/react-native-searchbar.git#setValue-function",
112113
"react-native-tableview-simple": "0.17.5",
113114
"react-native-typography": "1.3.0",
114115
"react-native-vector-icons": "4.6.0",
115-
"react-navigation": "2.0.0",
116-
"react-navigation-material-bottom-tabs": "0.2.0",
116+
"react-navigation": "2.2.0",
117+
"react-navigation-material-bottom-tabs": "0.3.0",
117118
"react-redux": "5.0.7",
118119
"redux": "3.7.2",
119120
"redux-logger": "3.0.6",
@@ -132,28 +133,27 @@
132133
"ajv": "6.5.0",
133134
"babel-core": "6.26.0",
134135
"babel-eslint": "8.2.3",
135-
"babel-jest": "22.4.4",
136+
"babel-jest": "23.0.1",
136137
"babel-plugin-transform-remove-console": "6.9.4",
137138
"babel-preset-react-native": "4.0.0",
138139
"bugsnag-sourcemaps": "1.0.3",
139-
"danger": "3.6.6",
140+
"danger": "3.7.15",
140141
"danger-plugin-yarn": "1.3.0",
141142
"directory-tree": "2.1.0",
142143
"eslint": "4.19.1",
143144
"eslint-config-prettier": "2.9.0",
144145
"eslint-plugin-babel": "5.1.0",
145-
"eslint-plugin-flowtype": "2.46.3",
146+
"eslint-plugin-flowtype": "2.49.3",
146147
"eslint-plugin-react": "7.8.2",
147148
"eslint-plugin-react-native": "3.2.0",
148149
"flow-bin": "0.67.1",
149-
"jest": "22.4.2",
150-
"jest-junit": "4.0.0",
151-
"js-yaml": "3.11.0",
150+
"jest": "23.1.0",
151+
"js-yaml": "3.12.0",
152152
"junk": "2.1.0",
153153
"minimist": "1.2.0",
154154
"mkdirp": "0.5.1",
155155
"pify": "3.0.0",
156-
"prettier": "1.12.1",
156+
"prettier": "1.13.4",
157157
"pretty-bytes": "5.0.0",
158158
"pretty-quick": "1.6.0",
159159
"prop-types": "15.6.1",

‎source/views/building-hours/detail/toolbar-button.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ function mapDispatch(dispatch): ReduxDispatchProps {
4444
}
4545
}
4646

47-
export const ConnectedBuildingFavoriteButton = connect(mapState, mapDispatch)(
48-
BuildingFavoriteButton,
49-
)
47+
export const ConnectedBuildingFavoriteButton = connect(
48+
mapState,
49+
mapDispatch,
50+
)(BuildingFavoriteButton)

‎source/views/dictionary/list.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ export class DictionaryView extends React.PureComponent<Props, State> {
150150
cell={this.renderRow}
151151
cellHeight={
152152
ROW_HEIGHT +
153-
(Platform.OS === 'ios' ? 11 / 12 * StyleSheet.hairlineWidth : 0)
153+
(Platform.OS === 'ios' ? (11 / 12) * StyleSheet.hairlineWidth : 0)
154154
}
155155
data={groupBy(results, item => item.word[0])}
156156
onSearch={this.performSearch}

‎source/views/help/index.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ function mapDispatch(dispatch): ReduxDispatchProps {
7979
}
8080
}
8181

82-
export default connect(mapState, mapDispatch)(HelpView)
82+
export default connect(
83+
mapState,
84+
mapDispatch,
85+
)(HelpView)
8386

8487
const styles = StyleSheet.create({
8588
container: {

‎source/views/home/edit/list.android.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ function mapDispatch(dispatch): ReduxDispatchProps {
112112
}
113113
}
114114

115-
export const ConnectedEditHomeView = connect(mapState, mapDispatch)(
116-
EditHomeView,
117-
)
115+
export const ConnectedEditHomeView = connect(
116+
mapState,
117+
mapDispatch,
118+
)(EditHomeView)

‎source/views/home/edit/list.ios.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ function mapDispatch(dispatch): ReduxDispatchProps {
9595
}
9696
}
9797

98-
export const ConnectedEditHomeView = connect(mapState, mapDispatch)(
99-
EditHomeView,
100-
)
98+
export const ConnectedEditHomeView = connect(
99+
mapState,
100+
mapDispatch,
101+
)(EditHomeView)

‎source/views/menus/components/fancy-menu.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,4 +210,7 @@ const mapDispatch = (dispatch, actualProps: ReactProps): ReduxDispatchProps => {
210210
}
211211
}
212212

213-
export const ConnectedFancyMenu = connect(mapState, mapDispatch)(FancyMenu)
213+
export const ConnectedFancyMenu = connect(
214+
mapState,
215+
mapDispatch,
216+
)(FancyMenu)

‎source/views/settings/sections/login-credentials.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ function mapDispatchToProps(dispatch): ReduxDispatchProps {
147147
}
148148
}
149149

150-
export default connect(mapStateToProps, mapDispatchToProps)(
151-
CredentialsLoginSection,
152-
)
150+
export default connect(
151+
mapStateToProps,
152+
mapDispatchToProps,
153+
)(CredentialsLoginSection)

0 commit comments

Comments
 (0)