From 5c97e4b52eb60d4b4cb5dc4a8312db4b60a216ee Mon Sep 17 00:00:00 2001 From: Wietse Kuipers Date: Mon, 6 Feb 2017 15:27:49 +0100 Subject: [PATCH] Upgrade react versioN --- .flowconfig | 6 +- .gitignore | 1 + .../java/com/thaliapp/MainApplication.java | 2 +- app/components/Login.js | 6 +- ios/ThaliApp.xcodeproj/project.pbxproj | 265 +++++++++++++++++- package.json | 10 +- yarn.lock | 2 +- 7 files changed, 277 insertions(+), 15 deletions(-) diff --git a/.flowconfig b/.flowconfig index 876e701..b38ea97 100644 --- a/.flowconfig +++ b/.flowconfig @@ -34,11 +34,11 @@ suppress_type=$FlowIssue suppress_type=$FlowFixMe suppress_type=$FixMe -suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-6]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\) -suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-6]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+ +suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-7]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\) +suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-7]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy unsafe.enable_getters_and_setters=true [version] -^0.36.0 +^0.37.0 diff --git a/.gitignore b/.gitignore index fc13f16..8fce639 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ local.properties # node_modules/ npm-debug.log +yarn-error.log # BUCK buck-out/ diff --git a/android/app/src/main/java/com/thaliapp/MainApplication.java b/android/app/src/main/java/com/thaliapp/MainApplication.java index 12802d5..5d6f4c2 100644 --- a/android/app/src/main/java/com/thaliapp/MainApplication.java +++ b/android/app/src/main/java/com/thaliapp/MainApplication.java @@ -17,7 +17,7 @@ public class MainApplication extends Application implements ReactApplication { private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) { @Override - protected boolean getUseDeveloperSupport() { + public boolean getUseDeveloperSupport() { return BuildConfig.DEBUG; } diff --git a/app/components/Login.js b/app/components/Login.js index 75cbce3..bc98a91 100644 --- a/app/components/Login.js +++ b/app/components/Login.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { View, Text, TextInput, Button } from 'react-native'; +import { View, TextInput, Button } from 'react-native'; export default class Login extends Component { constructor(props) { @@ -11,7 +11,7 @@ export default class Login extends Component { } render() { - const { loggedIn, login } = this.props; + const { login } = this.props; return ( @@ -23,13 +23,11 @@ export default class Login extends Component { secureTextEntry />