diff --git a/.flowconfig b/.flowconfig index e823ea557f..2c0425a9ca 100644 --- a/.flowconfig +++ b/.flowconfig @@ -40,11 +40,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 5ae7c014fb..7b9277cf8c 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ local.properties # node_modules/ npm-debug.log +yarn-error.log # BUCK # diff --git a/android/app/src/main/java/org/jitsi/meet/MainApplication.java b/android/app/src/main/java/org/jitsi/meet/MainApplication.java index 437e0743a7..0a2b2c45e2 100644 --- a/android/app/src/main/java/org/jitsi/meet/MainApplication.java +++ b/android/app/src/main/java/org/jitsi/meet/MainApplication.java @@ -16,7 +16,7 @@ public class MainApplication extends Application implements ReactApplication { * {@inheritDoc} */ @Override - protected boolean getUseDeveloperSupport() { + public boolean getUseDeveloperSupport() { return BuildConfig.DEBUG; } diff --git a/ios/app/AppDelegate.m b/ios/app/AppDelegate.m index d6f468dd44..077ea011e1 100644 --- a/ios/app/AppDelegate.m +++ b/ios/app/AppDelegate.m @@ -8,10 +8,11 @@ */ #import "AppDelegate.h" -#import "RCTAssert.h" -#import "RCTBundleURLProvider.h" -#import "RCTLinkingManager.h" -#import "RCTRootView.h" + +#import +#import +#import +#import /** * A RCTFatalHandler implementation which swallows JavaScript errors. diff --git a/package.json b/package.json index d65ce8207e..f0e9aee5e8 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "postis": "^2.2.0", "react": "15.4.2", "react-dom": "15.4.2", - "react-native": "0.40.0", + "react-native": "0.41.2", "react-native-keep-awake": "^2.0.2", "react-native-prompt": "^1.0.0", "react-native-vector-icons": "^4.0.0", @@ -67,7 +67,7 @@ "eslint-plugin-react-native": "^2.2.1", "expose-loader": "*", "file-loader": "^0.10.0", - "flow-bin": "^0.36.0", + "flow-bin": "^0.37.0", "haste-resolver-webpack-plugin": "^0.2.2", "imports-loader": "*", "jshint": "2.9.4",