Skip to content
GitLab
Commit fdbae6d8 authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files

Merge branch 'update-react-native' into 'master' 

Update react native to 0.56 and directly update dependencies

See merge request !180
parents f13fc66d 2ef7d358
Hide whitespace changes
Inline Side-by-side
.babelrc
View file @ fdbae6d8
{
"presets": ["react-native"],
"plugins": ["transform-object-rest-spread", "transform-regenerator"]
}
"plugins": ["@babel/plugin-proposal-object-rest-spread", "@babel/transform-regenerator"]
}
\ No newline at end of file
.eslintrc.json
View file @ fdbae6d8
......@@ -42,6 +42,8 @@
"react-native/split-platform-components": 2,
"react-native/no-inline-styles": 2,
"react-native/no-color-literals": 2,
"react/destructuring-assignment": 0,
"prefer-destructuring": 0,
"react/jsx-filename-extension": 0,
"react/prefer-stateless-function": 1,
"import/prefer-default-export": 1
......
.flowconfig
View file @ fdbae6d8
......@@ -30,6 +30,19 @@ node_modules/react-native/flow-github/
emoji=true
module.system=haste
module.system.haste.use_name_reducers=true
# get basename
module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
# strip .js or .js.flow suffix
module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
# strip .ios suffix
module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
module.system.haste.paths.blacklist=.*/__tests__/.*
module.system.haste.paths.blacklist=.*/__mocks__/.*
module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
munge_underscores=true
......@@ -51,4 +64,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
[version]
^0.65.0
^0.75.0
.gitignore
View file @ fdbae6d8
......@@ -56,4 +56,7 @@ buck-out/
*/fastlane/Preview.html
*/fastlane/screenshots
# Bundle artifact
*.jsbundle
bundle.js
__tests__/ui/components/button/__snapshots__/Button.spec.js.snap
View file @ fdbae6d8
......@@ -2,15 +2,8 @@
exports[`Button component renders correctly 1`] = `
<View
accessibilityComponentType={undefined}
accessibilityLabel={undefined}
accessibilityTraits={undefined}
accessible={true}
hasTVPreferredFocus={undefined}
hitSlop={undefined}
isTVSelectable={true}
nativeID={undefined}
onLayout={undefined}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
......@@ -25,8 +18,6 @@ exports[`Button component renders correctly 1`] = `
},
]
}
testID={undefined}
tvParallaxProperties={undefined}
>
<View
style={
......@@ -44,9 +35,6 @@ exports[`Button component renders correctly 1`] = `
}
>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Array [
Object {
......@@ -67,15 +55,8 @@ exports[`Button component renders correctly 1`] = `
exports[`Button component renders disabled correctly 1`] = `
<View
accessibilityComponentType={undefined}
accessibilityLabel={undefined}
accessibilityTraits={undefined}
accessible={true}
hasTVPreferredFocus={undefined}
hitSlop={undefined}
isTVSelectable={true}
nativeID={undefined}
onLayout={undefined}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
......@@ -93,8 +74,6 @@ exports[`Button component renders disabled correctly 1`] = `
},
]
}
testID={undefined}
tvParallaxProperties={undefined}
>
<View
style={
......@@ -112,9 +91,6 @@ exports[`Button component renders disabled correctly 1`] = `
}
>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Array [
Object {
......@@ -135,15 +111,8 @@ exports[`Button component renders disabled correctly 1`] = `
exports[`Button component renders title correctly on Android 1`] = `
<View
accessibilityComponentType={undefined}
accessibilityLabel={undefined}
accessibilityTraits={undefined}
accessible={true}
hasTVPreferredFocus={undefined}
hitSlop={undefined}
isTVSelectable={true}
nativeID={undefined}
onLayout={undefined}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
......@@ -158,8 +127,6 @@ exports[`Button component renders title correctly on Android 1`] = `
},
]
}
testID={undefined}
tvParallaxProperties={undefined}
>
<View
style={
......@@ -177,9 +144,6 @@ exports[`Button component renders title correctly on Android 1`] = `
}
>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Array [
Object {
......
__tests__/ui/components/dismissKeyboardView/__snapshots__/DismissKeyboardView.spec.js.snap
View file @ fdbae6d8
......@@ -2,13 +2,7 @@
exports[`DismissKeyboardView component renders correctly 1`] = `
<View
accessibilityComponentType={undefined}
accessibilityLabel={undefined}
accessibilityTraits={undefined}
accessible={false}
hitSlop={undefined}
nativeID={undefined}
onLayout={undefined}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
......@@ -16,13 +10,8 @@ exports[`DismissKeyboardView component renders correctly 1`] = `
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
style={Object {}}
testID={undefined}
>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
>
<Text>
Text
</Text>
</View>
......
__tests__/ui/components/errorScreen/__snapshots__/ErrorScreen.spec.js.snap
View file @ fdbae6d8
......@@ -27,9 +27,6 @@ exports[`ErrorScreen component renders correctly 1`] = `
}
/>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Object {
"color": "#616161",
......@@ -43,9 +40,6 @@ exports[`ErrorScreen component renders correctly 1`] = `
Lorem ipsum
</Text>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Object {
"color": "#616161",
......
__tests__/ui/components/memberView/__snapshots__/MemberView.spec.js.snap
View file @ fdbae6d8
......@@ -13,15 +13,8 @@ exports[`MemberView component renders correctly 1`] = `
}
>
<View
accessibilityComponentType={undefined}
accessibilityLabel={undefined}
accessibilityTraits={undefined}
accessible={true}
hasTVPreferredFocus={undefined}
hitSlop={undefined}
isTVSelectable={true}
nativeID={undefined}
onLayout={undefined}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
......@@ -33,8 +26,6 @@ exports[`MemberView component renders correctly 1`] = `
"flex": 1,
}
}
testID={undefined}
tvParallaxProperties={undefined}
>
<View
style={
......@@ -73,9 +64,7 @@ exports[`MemberView component renders correctly 1`] = `
4278190080,
]
}
endPoint={undefined}
locations={null}
startPoint={undefined}
style={
Object {
"bottom": 0,
......@@ -88,9 +77,6 @@ exports[`MemberView component renders correctly 1`] = `
}
/>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Object {
"backgroundColor": "transparent",
......
__tests__/ui/components/navigator/__snapshots__/ReduxNavigator.spec.js.snap
View file @ fdbae6d8
......@@ -17,8 +17,6 @@ exports[`ReduxNavigator component renders correctly 1`] = `
}
/>
<View
enabled={true}
keyboardVerticalOffset={0}
modalOpen="false"
onLayout={[Function]}
style={
......@@ -36,13 +34,7 @@ exports[`ReduxNavigator component renders correctly 1`] = `
}
>
<View
accessibilityComponentType={undefined}
accessibilityLabel={undefined}
accessibilityTraits={undefined}
accessible={false}
hitSlop={undefined}
nativeID={undefined}
onLayout={undefined}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
......@@ -55,7 +47,6 @@ exports[`ReduxNavigator component renders correctly 1`] = `
"justifyContent": "center",
}
}
testID={undefined}
>
<Image
source={
......@@ -90,6 +81,7 @@ exports[`ReduxNavigator component renders correctly 1`] = `
"padding": 8,
}
}
underlineColorAndroid="#313131"
/>
<TextInput
allowFontScaling={true}
......@@ -109,18 +101,12 @@ exports[`ReduxNavigator component renders correctly 1`] = `
"padding": 8,
}
}
underlineColorAndroid="#313131"
/>
</View>
<View
accessibilityComponentType={undefined}
accessibilityLabel={undefined}
accessibilityTraits={undefined}
accessible={true}
hasTVPreferredFocus={undefined}
hitSlop={undefined}
isTVSelectable={true}
nativeID={undefined}
onLayout={undefined}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
......@@ -140,8 +126,6 @@ exports[`ReduxNavigator component renders correctly 1`] = `
},
]
}
testID={undefined}
tvParallaxProperties={undefined}
>
<View
style={
......@@ -159,9 +143,6 @@ exports[`ReduxNavigator component renders correctly 1`] = `
}
>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Array [
Object {
......@@ -181,9 +162,6 @@ exports[`ReduxNavigator component renders correctly 1`] = `
</View>
</View>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
onPress={[Function]}
style={
Object {
......
__tests__/ui/components/navigator/__snapshots__/Sidebar.spec.js.snap
View file @ fdbae6d8
......@@ -11,15 +11,8 @@ exports[`Sidebar component renders correctly 1`] = `
}
>
<View
accessibilityComponentType={undefined}
accessibilityLabel={undefined}
accessibilityTraits={undefined}
accessible={true}
hasTVPreferredFocus={undefined}
hitSlop={undefined}
isTVSelectable={true}
nativeID={undefined}
onLayout={undefined}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
......@@ -31,8 +24,6 @@ exports[`Sidebar component renders correctly 1`] = `
"height": 168,
}
}
testID={undefined}
tvParallaxProperties={undefined}
>
<View
style={
......@@ -77,9 +68,7 @@ exports[`Sidebar component renders correctly 1`] = `
4278190080,
]
}
endPoint={undefined}
locations={null}
startPoint={undefined}
style={
Object {
"bottom": 0,
......@@ -107,9 +96,6 @@ exports[`Sidebar component renders correctly 1`] = `
}
/>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Object {
"color": "#FFFFFF",
......@@ -131,15 +117,8 @@ exports[`Sidebar component renders correctly 1`] = `
}
>
<View
accessibilityComponentType={undefined}
accessibilityLabel={undefined}
accessibilityTraits={undefined}
accessible={true}
hasTVPreferredFocus={undefined}
hitSlop={undefined}
isTVSelectable={true}
nativeID={undefined}
onLayout={undefined}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
......@@ -157,8 +136,6 @@ exports[`Sidebar component renders correctly 1`] = `
},
]
}
testID={undefined}
tvParallaxProperties={undefined}
>
<View
style={
......@@ -183,9 +160,7 @@ exports[`Sidebar component renders correctly 1`] = `
}
>
<Text
accessible={true}
allowFontScaling={false}
ellipsizeMode="tail"
onPress={[Function]}
style={
Array [
......@@ -214,9 +189,6 @@ exports[`Sidebar component renders correctly 1`] = `
</Text>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Array [
Object {
......@@ -234,15 +206,8 @@ exports[`Sidebar component renders correctly 1`] = `
</View>
</View>
<View
accessibilityComponentType={undefined}
accessibilityLabel={undefined}
accessibilityTraits={undefined}
accessible={true}
hasTVPreferredFocus={undefined}
hitSlop={undefined}
isTVSelectable={true}
nativeID={undefined}
onLayout={undefined}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
......@@ -260,8 +225,6 @@ exports[`Sidebar component renders correctly 1`] = `
},
]
}
testID={undefined}
tvParallaxProperties={undefined}
>
<View
style={
......@@ -286,9 +249,7 @@ exports[`Sidebar component renders correctly 1`] = `
}
>
<Text
accessible={true}
allowFontScaling={false}
ellipsizeMode="tail"
onPress={[Function]}
style={
Array [
......@@ -317,9 +278,6 @@ exports[`Sidebar component renders correctly 1`] = `
</Text>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Array [
Object {
......@@ -337,15 +295,8 @@ exports[`Sidebar component renders correctly 1`] = `
</View>
</View>
<View
accessibilityComponentType={undefined}
accessibilityLabel={undefined}
accessibilityTraits={undefined}
accessible={true}
hasTVPreferredFocus={undefined}
hitSlop={undefined}
isTVSelectable={true}
nativeID={undefined}
onLayout={undefined}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
......@@ -363,8 +314,6 @@ exports[`Sidebar component renders correctly 1`] = `
},
]
}
testID={undefined}
tvParallaxProperties={undefined}
>
<View
style={
......@@ -389,9 +338,7 @@ exports[`Sidebar component renders correctly 1`] = `
}
>
<Text
accessible={true}
allowFontScaling={false}
ellipsizeMode="tail"
onPress={[Function]}
style={
Array [
......@@ -420,9 +367,6 @@ exports[`Sidebar component renders correctly 1`] = `
</Text>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Array [
Object {
......@@ -440,15 +384,8 @@ exports[`Sidebar component renders correctly 1`] = `
</View>
</View>
<View
accessibilityComponentType={undefined}
accessibilityLabel={undefined}
accessibilityTraits={undefined}
accessible={true}
hasTVPreferredFocus={undefined}
hitSlop={undefined}
isTVSelectable={true}
nativeID={undefined}
onLayout={undefined}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
......@@ -466,8 +403,6 @@ exports[`Sidebar component renders correctly 1`] = `
},
]
}
testID={undefined}
tvParallaxProperties={undefined}
>
<View
style={
......@@ -495,9 +430,7 @@ exports[`Sidebar component renders correctly 1`] = `
}
>
<Text
accessible={true}
allowFontScaling={false}
ellipsizeMode="tail"
onPress={[Function]}
style={
Array [
......@@ -526,9 +459,6 @@ exports[`Sidebar component renders correctly 1`] = `
</Text>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Array [
Object {
......
__tests__/ui/components/standardHeader/__snapshots__/StandardHeader.spec.js.snap
View file @ fdbae6d8
......@@ -25,16 +25,8 @@ exports[`StandardHeader component renders correctly 1`] = `
}
>
<View
accessibilityComponentType={undefined}
accessibilityLabel={undefined}
accessibilityTraits={undefined}
accessible={true}
collapsable={undefined}
hasTVPreferredFocus={undefined}
hitSlop={undefined}
isTVSelectable={true}
nativeID={undefined}
onLayout={undefined}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
......@@ -46,13 +38,9 @@ exports[`StandardHeader component renders correctly 1`] = `
"opacity": 1,
}
}
testID={undefined}
tvParallaxProperties={undefined}
>
<Text
accessible={true}
allowFontScaling={false}
ellipsizeMode="tail"
style={
Array [
Object {
......@@ -76,9 +64,6 @@ exports[`StandardHeader component renders correctly 1`] = `
</Text>
</View>
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Object {
"color": "#FFFFFF",
......
android/app/build.gradle
View file @ fdbae6d8
......@@ -95,8 +95,8 @@ def enableSeparateBuildPerCPUArchitecture = false
def enableProguardInReleaseBuilds = false
android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
lintOptions {
abortOnError false
......@@ -104,8 +104,8 @@ android {
defaultConfig {
applicationId "com.thaliapp"
minSdkVersion 19
targetSdkVersion 22
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 423
versionName "2.3.2"
ndk {
......@@ -145,15 +145,16 @@ android {
}
dependencies {
compile project(':react-native-locale-detector')
compile project(':react-native-vector-icons')
compile project(':react-native-snackbar')
compile project(':react-native-linear-gradient')
compile project(':react-native-fcm')
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:23.0.1"
compile "com.facebook.react:react-native:+" // From node_modules
compile 'com.google.firebase:firebase-core:11.4.0'
implementation project(':react-native-locale-detector')
implementation project(':react-native-vector-icons')
implementation project(':react-native-snackbar')
implementation project(':react-native-linear-gradient')
implementation project(':react-native-fcm')
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
implementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
implementation "com.facebook.react:react-native:+" // From node_modules
implementation 'com.google.firebase:firebase-core:11.4.0'
}