[Dev] Update to React Native 0.54

.vscode/settings.json

@@ -5,7 +5,8 @@
     "*.h": "objective-c",
     "*.js": "javascriptreact",
     "*.snap": "javascriptreact",
-    ".stylelintrc": "json"
+    ".stylelintrc": "json",
+    "yarn.lock": "text"
   },
   "eslint.enable": false,
   "flow.enabled": false,

CHANGELOG.md

@@ -14,6 +14,10 @@
 
 -->
 
+## Master
+
+* Upgrade to React Native 0.54.0 - alloy
+
 ## 1.4.6
 
 * Scroll to last sent message upon send - sarah

Emission.podspec

@@ -30,9 +30,9 @@ podspec = Pod::Spec.new do |s|
   s.dependency 'Artsy+UIFonts', '>= 3.0.0'
   s.dependency 'Extraction', '>= 1.2.1'
 
-  s.dependency 'Yoga', "#{react_native_version}.React"
+  s.dependency 'yoga', "#{react_native_version}.React"
   s.dependency 'React/Core', react_native_version
-  s.dependency 'React/BatchedBridge', react_native_version
+  s.dependency 'React/CxxBridge', react_native_version
   s.dependency 'React/RCTAnimation', react_native_version
   s.dependency 'React/RCTCameraRoll', react_native_version
   s.dependency 'React/RCTImage', react_native_version

Example/Podfile

@@ -16,14 +16,20 @@ install! 'cocoapods', :deterministic_uuids => false
 node_modules_path = '../node_modules'
 react_path = File.join(node_modules_path, 'react-native')
 yoga_path = File.join(react_path, 'ReactCommon/yoga')
+folly_spec_path = File.join(react_path, 'third-party-podspecs/Folly.podspec')
+glog_spec_path = File.join(react_path, 'third-party-podspecs/glog.podspec')
+double_conversion_spec_path = File.join(react_path, 'third-party-podspecs/DoubleConversion.podspec')
 sentry_path = File.join(node_modules_path, 'react-native-sentry')
 
 target 'Emission' do
   pod 'Emission', :path => '../', :inhibit_warnings => false
 
   # As this runs dev, we need the developer web socket
   pod 'React', :path => react_path, :subspecs => %w(DevSupport)
-  pod 'Yoga', :path => yoga_path
+  pod 'yoga', :path => yoga_path
+  pod 'Folly', :podspec => folly_spec_path
+  pod 'DoubleConversion', :podspec => double_conversion_spec_path
+  pod 'glog', :podspec => glog_spec_path
 
   pod 'Sentry', :subspecs => ['Core', 'KSCrash']
   pod 'SentryReactNative', :path => sentry_path
@@ -70,12 +76,13 @@ post_install do |installer|
     config.build_settings['CLANG_WARN_STRICT_PROTOTYPES'] = 'NO'
   end
 
-  # This fixes a bug in our Home tab view; it can probably be removed when we upgrade to RN 0.50+
-  # See https://github.com/artsy/collector-experience/issues/751
-  react_scrollview_file = '../node_modules/react-native/React/Views/RCTScrollView.m'
-  react_scrollview_old_code = 'self.contentOffset = CGPointMake(
-    MAX(0, MIN(originalOffset.x, fullContentSize.width - boundsSize.width)),
-    MAX(0, MIN(originalOffset.y, fullContentSize.height - boundsSize.height)));'
-  react_scrollview_new_code = 'self.contentOffset= originalOffset;'
+  # Bug with 0.51 where they include the TV remote handler without using it
+  # It's fixed in master.
+  react_scrollview_file = '../node_modules/react-native/React/Views/RCTModalHostView.m'
+  react_scrollview_old_code = '#import "RCTTVRemoteHandler.h"'
+  react_scrollview_new_code = '//#import "RCTTVRemoteHandler.h"'
   edit_pod_file react_scrollview_file, react_scrollview_old_code, react_scrollview_new_code
+
+  # https://github.com/facebook/react-native/pull/17783
+  edit_pod_file '../node_modules/react-native/React.podspec', "Libraries/Text/*.{h,m}", "Libraries/Text/**/*.{h,m}"
 end

Example/Podfile.lock

@@ -9,21 +9,23 @@ PODS:
     - Artsy+UIColors (~> 3.0)
     - Artsy+UIFonts
     - UIView+BooleanAnimations
+  - boost-for-react-native (1.63.0)
+  - DoubleConversion (1.1.5)
   - Emission (1.4.6):
     - Artsy+UIColors
     - Artsy+UIFonts (>= 3.0.0)
     - Extraction (>= 1.2.1)
-    - React/BatchedBridge (= 0.48.4)
-    - React/Core (= 0.48.4)
-    - React/RCTAnimation (= 0.48.4)
-    - React/RCTCameraRoll (= 0.48.4)
-    - React/RCTImage (= 0.48.4)
-    - React/RCTLinkingIOS (= 0.48.4)
-    - React/RCTNetwork (= 0.48.4)
-    - React/RCTText (= 0.48.4)
+    - React/Core (= 0.54.0)
+    - React/CxxBridge (= 0.54.0)
+    - React/RCTAnimation (= 0.54.0)
+    - React/RCTCameraRoll (= 0.54.0)
+    - React/RCTImage (= 0.54.0)
+    - React/RCTLinkingIOS (= 0.54.0)
+    - React/RCTNetwork (= 0.54.0)
+    - React/RCTText (= 0.54.0)
     - SDWebImage (< 4, >= 3.7.2)
     - SentryReactNative (= 0.30.3)
-    - Yoga (= 0.48.4.React)
+    - yoga (= 0.54.0.React)
   - Extraction (1.2.3):
     - Extraction/ARAnimationContinuation (= 1.2.3)
     - Extraction/ARLoadFailureView (= 1.2.3)
@@ -48,6 +50,11 @@ PODS:
   - Extraction/UIView+ARSpinner (1.2.3):
     - Extraction/ARAnimationContinuation
   - FLKAutoLayout (1.0.0)
+  - Folly (2016.09.26.00):
+    - boost-for-react-native
+    - DoubleConversion
+    - glog
+  - glog (0.3.4)
   - ISO8601DateFormatter (0.8)
   - Keys (1.0.0)
   - KSCrash/Core (1.15.16):
@@ -63,37 +70,47 @@ PODS:
   - NSURL+QueryDictionary (1.2.0)
   - ORStackView (2.0.3):
     - FLKAutoLayout
-  - React (0.48.4):
-    - React/Core (= 0.48.4)
-  - React/BatchedBridge (0.48.4):
+  - React (0.54.0):
+    - React/Core (= 0.54.0)
+  - React/Core (0.54.0):
+    - yoga (= 0.54.0.React)
+  - React/CxxBridge (0.54.0):
+    - Folly (= 2016.09.26.00)
     - React/Core
-    - React/cxxreact_legacy
-  - React/Core (0.48.4):
-    - Yoga (= 0.48.4.React)
-  - React/cxxreact_legacy (0.48.4):
-    - React/jschelpers_legacy
-  - React/DevSupport (0.48.4):
+    - React/cxxreact
+  - React/cxxreact (0.54.0):
+    - boost-for-react-native (= 1.63.0)
+    - Folly (= 2016.09.26.00)
+    - React/jschelpers
+    - React/jsinspector
+  - React/DevSupport (0.54.0):
     - React/Core
     - React/RCTWebSocket
-  - React/jschelpers_legacy (0.48.4)
-  - React/RCTAnimation (0.48.4):
+  - React/fishhook (0.54.0)
+  - React/jschelpers (0.54.0):
+    - Folly (= 2016.09.26.00)
+    - React/PrivateDatabase
+  - React/jsinspector (0.54.0)
+  - React/PrivateDatabase (0.54.0)
+  - React/RCTAnimation (0.54.0):
     - React/Core
-  - React/RCTBlob (0.48.4):
+  - React/RCTBlob (0.54.0):
     - React/Core
-  - React/RCTCameraRoll (0.48.4):
+  - React/RCTCameraRoll (0.54.0):
     - React/Core
     - React/RCTImage
-  - React/RCTImage (0.48.4):
+  - React/RCTImage (0.54.0):
     - React/Core
     - React/RCTNetwork
-  - React/RCTLinkingIOS (0.48.4):
+  - React/RCTLinkingIOS (0.54.0):
     - React/Core
-  - React/RCTNetwork (0.48.4):
+  - React/RCTNetwork (0.54.0):
     - React/Core
-  - React/RCTText (0.48.4):
+  - React/RCTText (0.54.0):
     - React/Core
-  - React/RCTWebSocket (0.48.4):
+  - React/RCTWebSocket (0.54.0):
     - React/Core
+    - React/fishhook
     - React/RCTBlob
   - SAMKeychain (1.5.0)
   - SDWebImage (3.8.2):
@@ -110,35 +127,44 @@ PODS:
     - Sentry (~> 3.9.0)
     - Sentry/KSCrash (~> 3.9.0)
   - UIView+BooleanAnimations (1.0.2)
-  - Yoga (0.48.4.React)
+  - yoga (0.54.0.React)
 
 DEPENDENCIES:
   - ARGenericTableViewController
   - Artsy+Authentication/email (from `https://github.com/artsy/Artsy-Authentication.git`, branch `fetch-user-details`)
   - Artsy+UIFonts
+  - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - Emission (from `../`)
   - FLKAutoLayout
+  - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
+  - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - Keys (from `Pods/CocoaPodsKeys`)
   - React/DevSupport (from `../node_modules/react-native`)
   - SAMKeychain
   - Sentry/Core
   - Sentry/KSCrash
   - SentryReactNative (from `../node_modules/react-native-sentry`)
-  - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
+  - yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 EXTERNAL SOURCES:
   Artsy+Authentication:
     :branch: fetch-user-details
     :git: https://github.com/artsy/Artsy-Authentication.git
+  DoubleConversion:
+    :podspec: ../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec
   Emission:
     :path: ../
+  Folly:
+    :podspec: ../node_modules/react-native/third-party-podspecs/Folly.podspec
+  glog:
+    :podspec: ../node_modules/react-native/third-party-podspecs/glog.podspec
   Keys:
     :path: Pods/CocoaPodsKeys
   React:
     :path: ../node_modules/react-native
   SentryReactNative:
     :path: ../node_modules/react-native-sentry
-  Yoga:
+  yoga:
     :path: ../node_modules/react-native/ReactCommon/yoga
 
 CHECKOUT OPTIONS:
@@ -152,22 +178,26 @@ SPEC CHECKSUMS:
   Artsy+UIColors: 31c03c4146f5e6618a9b950f37dfe02dd9ac09a6
   Artsy+UIFonts: d38c82636e000b1dee31b7bec0268e1841dac17f
   Artsy-UIButtons: cdcc3ccf4d0d31ee80f45c1d11ffd2d772695b74
-  Emission: d5a03d538ac61b4074ab0370ad7d68f2419a7400
+  boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
+  DoubleConversion: ebb6747c5b66026ad4f97b789c3ceac6f18e57a6
+  Emission: 51505894af64d6fe128d94f3fa33785e9af4b086
   Extraction: 612cf0866f74d4c0dd616677ff24146efa200958
   FLKAutoLayout: 106b14dbae09d32c6730190f4e78a959759ba4a4
+  Folly: 211775e49d8da0ca658aebc8eab89d642935755c
+  glog: 1de0bb937dccdc981596d3b5825ebfb765017ded
   ISO8601DateFormatter: 4551b6ce4f83185425f583b0b3feb3c7b59b942c
   Keys: af65e23feef2a047b3277b1ef0399f1209ef9d46
   KSCrash: e4cda5c8612c5f9478defcf43418f24870d313f4
   NSURL+QueryDictionary: bae616404e2adf6409d3d5c02a093cbf44c8a236
   ORStackView: b9507271cb41fb9e0b3eecc6414d831201e7cf7c
-  React: 59267c3a5811102116842a84a29efaca58167ee8
+  React: c237e42de9c70e5cac6eeb52b4cfd3a0910c1f00
   SAMKeychain: 1fc9ae02f576365395758b12888c84704eebc423
   SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
   Sentry: e2707f9a6b498277d9620a48fcb1bd3b655c8473
   SentryReactNative: a292506edfa707119e3aa155892cdb07e453a93a
   UIView+BooleanAnimations: a760be9a066036e55f298b7b7350a6cb14cfcd97
-  Yoga: de6cde41559145f06b816e2bab5bfa980447798b
+  yoga: 55da126afc384965b96bff46652464373b330add
 
-PODFILE CHECKSUM: f0c9cdfda9e9f74df0800f76126ce5df042e3805
+PODFILE CHECKSUM: 128959142ec5a788e779c9a2f4497b309bba756d
 
 COCOAPODS: 1.4.0