revert to react-native 0.60.x

ExoSuite · Nov 7, 2019 · 2237bb6 · 2237bb6
1 parent 54785a6
commit 2237bb6
Show file tree

Hide file tree

Showing 7 changed files with 383 additions and 508 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath('com.android.tools.build:gradle:3.5.1')
+        classpath('com.android.tools.build:gradle:3.5.2')
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/app/screens/run-screen/run-screen.tsx b/app/screens/run-screen/run-screen.tsx
@@ -1,5 +1,5 @@
 import * as React from "react"
-import { ViewStyle } from "react-native"
+import { PermissionsAndroid, ViewStyle } from "react-native"
 import { Screen } from "@components/screen"
 import { color, spacing } from "@theme"
 import { NavigationScreenProps } from "react-navigation"
@@ -10,6 +10,7 @@ import autobind from "autobind-decorator"
 // tslint:disable-next-line: match-default-export-name
 import DeviceInfo from "react-native-device-info"
 import { IPersonalProfileNavigationScreenProps } from "@screens/user-profile-screen"
+import { Platform } from "@services/device"
 
 export interface IRunScreenProps extends NavigationScreenProps<{}> {
 }
@@ -37,6 +38,13 @@ export class RunScreen extends React.Component<IRunScreenProps> {
     this.props.navigation.navigate(AppScreens.AUGMENTED_REALITY)
   }
 
+  // tslint:disable-next-line: no-feature-envy
+  public componentDidMount(): void {
+    if (Platform.Android) {
+      PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.CAMERA).catch()
+    }
+  }
+
   public render(): React.ReactNode {
     return (
       <Screen style={ROOT} preset="scroll">

diff --git a/ios/Podfile b/ios/Podfile
@@ -6,36 +6,29 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ
 target 'ExoRun' do
 
  # Pods for test
-   pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
-   pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
-   pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"
-   pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety"
-   pod 'React', :path => '../node_modules/react-native/'
-   pod 'React-Core', :path => '../node_modules/react-native/'
-   pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
-   pod 'React-Core/DevSupport', :path => '../node_modules/react-native/'
-   pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
-   pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
-   pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
-   pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image'
-   pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS'
-   pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network'
-   pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
-   pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
-   pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
-   pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/'
+pod 'React', :path => '../node_modules/react-native/'
+  pod 'React-Core', :path => '../node_modules/react-native/React'
+  pod 'React-DevSupport', :path => '../node_modules/react-native/React'
+  pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
+  pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
+  pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
+  pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image'
+  pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS'
+  pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network'
+  pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
+  pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
+  pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
+  pod 'React-RCTWebSocket', :path => '../node_modules/react-native/Libraries/WebSocket'
 
-   pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
-   pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
-   pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
-   pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
-   pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon"
-   pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
-   pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
+  pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
+  pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
+  pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
+  pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
+  pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
 
-   pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
-   pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
-   pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
+  pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
+  pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
+  pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
 
   pod 'ViroReact', :path => '../node_modules/react-viro/ios/'
   pod 'ViroKit_static_lib', :path => '../node_modules/react-viro/ios/dist/ViroRenderer/static_lib'