RN0.60 upgrade (#3886)

.vscode/settings.json

@@ -4,5 +4,6 @@
   "editor.insertSpaces": true,
   "editor.tabSize": 2,
   "typescript.tsdk": "./node_modules/typescript/lib",
-  "tslint.configFile": "./tslint.json"
+  "tslint.configFile": "./tslint.json",
+  "git.ignoreLimitWarning": true
 }

android/app/build.gradle

@@ -238,6 +238,7 @@ android {
 }
 
 dependencies {
+    implementation project(':@react-native-community_netinfo')
   implementation project(':react-native-splash-screen')
   implementation project(':react-native-pure-jwt')
   implementation project(':react-native-action-sheet')

android/app/src/main/java/com/hippware/android/tinyrobot/MainApplication.java

@@ -3,6 +3,7 @@
 import androidx.multidex.MultiDexApplication;
 
 import com.facebook.react.ReactApplication;
+import com.reactnativecommunity.netinfo.NetInfoPackage;
 import org.devio.rn.splashscreen.SplashScreenReactPackage;
 import com.zaguiini.RNPureJwt.RNPureJwtPackage;
 import com.actionsheet.ActionSheetPackage;
@@ -28,7 +29,6 @@
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
-import com.lugg.ReactNativeConfig.ReactNativeConfigPackage;
 import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
 import com.rt2zz.reactnativecontacts.ReactNativeContacts;
 
@@ -52,6 +52,7 @@ public boolean getUseDeveloperSupport() {
     @Override
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(new MainReactPackage(),
+            new NetInfoPackage(),
             new SplashScreenReactPackage(), new RNPureJwtPackage(), new ActionSheetPackage(),
           new PickerPackage(), new AndroidOpenSettingsPackage(), new ExtraDimensionsPackage(), new RNLocalizePackage(),
           new RNBackgroundGeolocation(), BugsnagReactNative.getPackage(), new ReactNativePushNotificationPackage(),

android/settings.gradle

@@ -1,4 +1,6 @@
 rootProject.name = 'tinyrobot'
+include ':@react-native-community_netinfo'
+project(':@react-native-community_netinfo').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/netinfo/android')
 include ':react-native-splash-screen'
 project(':react-native-splash-screen').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-splash-screen/android')
 include ':react-native-pure-jwt'
@@ -39,8 +41,6 @@ include ':react-native-mixpanel'
 project(':react-native-mixpanel').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-mixpanel/android')
 include ':react-native-touch-through-view'
 project(':react-native-touch-through-view').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-touch-through-view/android')
-include ':react-native-config'
-project(':react-native-config').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-config/android')
 include ':react-native-contacts'
 project(':react-native-contacts').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-contacts/android')
 

ios/Podfile

@@ -1,23 +1,31 @@
 platform :ios, '9.0'
+require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
 def testing_pods
+  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 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
-  pod 'React', path: '../node_modules/react-native', :subspecs => [
-    'Core',
-    'CxxBridge',
-    'DevSupport',
-    'RCTActionSheet',
-    'RCTAnimation',
-    'RCTGeolocation',
-    'RCTImage',
-    'RCTLinkingIOS',
-    'RCTPushNotification',
-    'RCTNetwork',
-    'RCTSettings',
-    'RCTText',
-    'RCTVibration',
-    'RCTWebSocket'
-  ]
+
+  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 'React-RCTPushNotification', path: '../node_modules/react-native/Libraries/PushNotificationIOS'
   pod 'GoogleMaps'
   pod 'react-native-mixpanel', path: '../node_modules/react-native-mixpanel'
   pod 'react-native-maps', :path => '../node_modules/react-native-maps'
@@ -38,25 +46,29 @@ def testing_pods
   pod 'BVLinearGradient', :path => '../node_modules/react-native-linear-gradient'
   pod 'RNDeviceInfo', :path => '../node_modules/react-native-device-info'
   pod 'RNImageCropPicker', :path =>  '../node_modules/react-native-image-crop-picker'
-
+  
   # Add new pods below this line
-  pod 'react-native-splash-screen', :path => '../node_modules/react-native-splash-screen'
+  pod 'react-native-netinfo', :path => '../node_modules/@react-native-community/netinfo'
 
-  pod 'RNPureJwt', :path => '../node_modules/react-native-pure-jwt'
+  pod 'react-native-config', :path => '../node_modules/react-native-config'
 
-  pod 'RNLocalize', :path => '../node_modules/react-native-localize'
+  pod 'RNTouchThroughView', :path => '../node_modules/react-native-touch-through-view'
 
+  pod 'react-native-splash-screen', :path => '../node_modules/react-native-splash-screen'
+
+  pod 'RNPureJwt', :path => '../node_modules/react-native-pure-jwt'
+
+  pod 'RNLocalize', :path => '../node_modules/react-native-localize'
+
   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 'RNGestureHandler', :path => '../node_modules/react-native-gesture-handler'
 
   platform :ios, '9.0'
 end
 
 target 'tinyrobot' do
   testing_pods
-
+  
 end
 
 target 'tinyrobotStaging' do
@@ -70,13 +82,25 @@ post_install do |installer|
         config.build_settings['CLANG_ENABLE_MODULES'] = 'No'
       end
     end
-
-    targets_to_ignore = %w(React yoga)
+    
+    targets_to_ignore = %w(React)
 
     if targets_to_ignore.include? target.name
       target.remove_from_project
     end
-
+
+    if target.name == 'react-native-config'
+      phase = target.project.new(Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
+      phase.shell_script = "cd ../../"\
+      " && RNC_ROOT=./node_modules/react-native-config/"\
+      " && export SYMROOT=$RNC_ROOT/ios/ReactNativeConfig"\
+      " && export BUILD_DIR=$RNC_ROOT/ios/ReactNativeConfig"\
+      " && ruby $RNC_ROOT/ios/ReactNativeConfig/BuildDotenvConfig.ruby"
+
+      target.build_phases << phase
+      target.build_phases.move(phase,0)
+    end
+
     # if target.name == "React"
     #   target.remove_from_project
     # end