Update RN and Viro. iOS build working

2018-05-09 11:23:11 -07:00
parent 93cfa3b4dc
commit ccd159bb47
13 changed files with 1886 additions and 2274 deletions
--- a/mobile/ios/DeightonAR.xcodeproj/project.pbxproj
+++ b/mobile/ios/DeightonAR.xcodeproj/project.pbxproj
@@ -199,11 +199,11 @@
 				"${BUILT_PRODUCTS_DIR}/AWSDynamoDB/AWSDynamoDB.framework",
 				"${BUILT_PRODUCTS_DIR}/DoubleConversion/DoubleConversion.framework",
 				"${BUILT_PRODUCTS_DIR}/Folly/folly.framework",
-				"${BUILT_PRODUCTS_DIR}/GLog/glog.framework",
 				"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework",
 				"${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework",
 				"${BUILT_PRODUCTS_DIR}/React/React.framework",
 				"${PODS_ROOT}/../../node_modules/react-viro/ios/dist/ViroRenderer/ViroKit.framework",
+				"${BUILT_PRODUCTS_DIR}/glog/glog.framework",
 				"${BUILT_PRODUCTS_DIR}/react-native-image-picker/react_native_image_picker.framework",
 				"${BUILT_PRODUCTS_DIR}/react-native-maps/react_native_maps.framework",
 				"${BUILT_PRODUCTS_DIR}/yoga/yoga.framework",
@@ -214,11 +214,11 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AWSDynamoDB.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DoubleConversion.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/folly.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ViroKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_native_image_picker.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_native_maps.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework",
--- a/mobile/ios/Podfile
+++ b/mobile/ios/Podfile
@@ -23,7 +23,7 @@ target 'DeightonAR' do

  # Third party deps podspec link
  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 '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-native-maps', path: '../node_modules/react-native-maps'
@@ -37,22 +37,61 @@ target 'DeightonAR' do
  pod 'react-native-image-picker', :path => '../node_modules/react-native-image-picker'
 end

-pre_install do |installer|
-	# workaround for https://github.com/CocoaPods/CocoaPods/issues/3289
-  Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
+# See https://gist.github.com/Jpunt/3fe75effd54a702034b75ff697e47578
+#
+# When using RN in combination with Cocoapods, a lot of
+# things are broken. These are the fixes we had to append
+# to our Podfile when upgrading to ReactNative@0.55.3.
+#
+# WARNING: Check those line numbers when you're on a different version!
+
+def change_lines_in_file(file_path, &change)
+  print "Fixing #{file_path}...\n"
+
+  contents = []
+
+  file = File.open(file_path, 'r')
+  file.each_line do | line |
+    contents << line
+  end
+  file.close
+
+  File.open(file_path, 'w') do |f|
+    f.puts(change.call(contents))
+  end
 end

 post_install do |installer|
-  installer.pods_project.targets.each do |target|
-    if target.name == 'yoga'
-      target.build_configurations.each do |config|
-          config.build_settings['GCC_TREAT_WARNINGS_AS_ERRORS'] = 'NO'
-          config.build_settings['GCC_WARN_64_TO_32_BIT_CONVERSION'] = 'NO'
-      end
-    elsif target.name == 'react-native-google-maps'
-      target.build_configurations.each do |config|
-        config.build_settings['CLANG_ENABLE_MODULES'] = 'NO'
-      end
+  # https://github.com/facebook/yoga/issues/711#issuecomment-381098373
+  change_lines_in_file('./Pods/Target Support Files/yoga/yoga-umbrella.h') do |lines|
+    lines.reject do | line |
+      [
+        '#import "Utils.h"',
+        '#import "YGLayout.h"',
+        '#import "YGNode.h"',
+        '#import "YGNodePrint.h"',
+        '#import "YGStyle.h"',
+        '#import "Yoga-internal.h"',
+      ].include?(line.strip)
    end
  end
-end
+
+  # https://github.com/facebook/yoga/issues/711#issuecomment-374605785
+  change_lines_in_file('../node_modules/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h') do |lines|
+    unless lines[27].include?("#ifdef __cplusplus")
+      lines.insert(27, "#ifdef __cplusplus")
+      lines.insert(34, "#endif")
+    end
+    lines
+  end
+
+  # https://github.com/facebook/react-native/issues/13198
+  change_lines_in_file('../node_modules/react-native/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h') do |lines|
+    lines.map { |line| line.include?("#import <RCTAnimation/RCTValueAnimatedNode.h>") ? '#import "RCTValueAnimatedNode.h"' : line }
+  end
+
+  # https://github.com/facebook/react-native/issues/16039
+  change_lines_in_file('../node_modules/react-native/Libraries/WebSocket/RCTReconnectingWebSocket.m') do |lines|
+    lines.map { |line| line.include?("#import <fishhook/fishhook.h>") ? '#import "fishhook.h"' : line }
+  end
+end
--- a/mobile/ios/Podfile.lock
+++ b/mobile/ios/Podfile.lock
@@ -1,28 +1,14 @@
 PODS:
-  - AWSCore (2.6.13)
-  - AWSDynamoDB (2.6.13):
-    - AWSCore (= 2.6.13)
-  - boost (1.59.0):
-    - boost/graph-includes (= 1.59.0)
-    - boost/math-includes (= 1.59.0)
-    - boost/numeric-includes (= 1.59.0)
-    - boost/pointer_cast-includes (= 1.59.0)
-    - boost/preprocessor-includes (= 1.59.0)
-    - boost/shared_ptr-includes (= 1.59.0)
-    - boost/string_algorithms-includes (= 1.59.0)
-  - boost/graph-includes (1.59.0)
-  - boost/math-includes (1.59.0)
-  - boost/numeric-includes (1.59.0)
-  - boost/pointer_cast-includes (1.59.0)
-  - boost/preprocessor-includes (1.59.0)
-  - boost/shared_ptr-includes (1.59.0)
-  - boost/string_algorithms-includes (1.59.0)
+  - AWSCore (2.6.17)
+  - AWSDynamoDB (2.6.17):
+    - AWSCore (= 2.6.17)
+  - boost-for-react-native (1.63.0)
  - DoubleConversion (1.1.5)
  - Folly (2016.09.26.00):
-    - boost
+    - boost-for-react-native
    - DoubleConversion
-    - GLog
-  - GLog (0.3.4)
+    - glog
+  - glog (0.3.4)
  - GoogleToolboxForMac/Defines (2.1.0)
  - GoogleToolboxForMac/Logger (2.1.0):
    - GoogleToolboxForMac/Defines (= 2.1.0)
@@ -31,42 +17,46 @@ PODS:
  - GVRSDK (1.120.0):
    - GoogleToolboxForMac/Logger (= 2.1.0)
    - GTMSessionFetcher/Core (= 1.1.6)
-  - React (0.49.5):
-    - React/Core (= 0.49.5)
+  - React (0.55.4):
+    - React/Core (= 0.55.4)
  - react-native-image-picker (0.14.3):
    - React
-  - react-native-maps (0.20.1):
+  - react-native-maps (0.21.0):
    - React
-  - React/Core (0.49.5):
-    - yoga (= 0.49.5.React)
-  - React/CxxBridge (0.49.5):
+  - React/Core (0.55.4):
+    - yoga (= 0.55.4.React)
+  - React/CxxBridge (0.55.4):
    - Folly (= 2016.09.26.00)
    - React/Core
    - React/cxxreact
-  - React/cxxreact (0.49.5):
-    - boost
+  - React/cxxreact (0.55.4):
+    - boost-for-react-native (= 1.63.0)
    - Folly (= 2016.09.26.00)
    - React/jschelpers
-  - React/DevSupport (0.49.5):
+    - React/jsinspector
+  - React/DevSupport (0.55.4):
    - React/Core
    - React/RCTWebSocket
-  - React/fishhook (0.49.5)
-  - React/jschelpers (0.49.5):
+  - React/fishhook (0.55.4)
+  - React/jschelpers (0.55.4):
    - Folly (= 2016.09.26.00)
-  - React/RCTAnimation (0.49.5):
+    - React/PrivateDatabase
+  - React/jsinspector (0.55.4)
+  - React/PrivateDatabase (0.55.4)
+  - React/RCTAnimation (0.55.4):
    - React/Core
-  - React/RCTBlob (0.49.5):
+  - React/RCTBlob (0.55.4):
    - React/Core
-  - React/RCTGeolocation (0.49.5):
+  - React/RCTGeolocation (0.55.4):
    - React/Core
-  - React/RCTImage (0.49.5):
+  - React/RCTImage (0.55.4):
    - React/Core
    - React/RCTNetwork
-  - React/RCTNetwork (0.49.5):
+  - React/RCTNetwork (0.55.4):
    - React/Core
-  - React/RCTText (0.49.5):
+  - React/RCTText (0.55.4):
    - React/Core
-  - React/RCTWebSocket (0.49.5):
+  - React/RCTWebSocket (0.55.4):
    - React/Core
    - React/fishhook
    - React/RCTBlob
@@ -75,12 +65,12 @@ PODS:
    - GVRAudioSDK (= 1.120.0)
    - GVRSDK (= 1.120.0)
  - ViroReact (1.0)
-  - yoga (0.49.5.React)
+  - yoga (0.55.4.React)

 DEPENDENCIES:
  - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
  - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
-  - GLog (from `../node_modules/react-native/third-party-podspecs/GLog.podspec`)
+  - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
  - react-native-image-picker (from `../node_modules/react-native-image-picker`)
  - react-native-maps (from `../node_modules/react-native-maps`)
  - React/Core (from `../node_modules/react-native`)
@@ -100,7 +90,7 @@ SPEC REPOS:
  https://github.com/CocoaPods/Specs.git:
    - AWSCore
    - AWSDynamoDB
-    - boost
+    - boost-for-react-native
    - GoogleToolboxForMac
    - GTMSessionFetcher
    - GVRAudioSDK
@@ -111,8 +101,8 @@ EXTERNAL SOURCES:
    :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
  Folly:
    :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
-  GLog:
-    :podspec: "../node_modules/react-native/third-party-podspecs/GLog.podspec"
+  glog:
+    :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
  React:
    :path: "../node_modules/react-native"
  react-native-image-picker:
@@ -127,23 +117,23 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native/ReactCommon/yoga"

 SPEC CHECKSUMS:
-  AWSCore: 5da797bc476188fdaf00dec134fa18d84708eca9
-  AWSDynamoDB: 36abff7ce93fcadad2c4dc6f729d8716c933adf2
-  boost: 30a15ffb6d9aa4646dd3caffc960753f4cb4ca4e
-  DoubleConversion: ebb6747c5b66026ad4f97b789c3ceac6f18e57a6
-  Folly: b7255b29f1d693c375d642d0f04f0592181156d9
-  GLog: 3e4e4ae9746ce6bf6e9420c7fc1e08ad59c8ba1a
+  AWSCore: 82fbb01d73a22cfae77ac2f03f6073a123092452
+  AWSDynamoDB: bbfc2583819099ccc0ba92eb54cb425049d4278b
+  boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
+  DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c
+  Folly: 211775e49d8da0ca658aebc8eab89d642935755c
+  glog: 1de0bb937dccdc981596d3b5825ebfb765017ded
  GoogleToolboxForMac: 2b2596cbb7186865e98cadf2b1e262d851c2b168
  GTMSessionFetcher: 6aacd0ab48ddf0c3633ab2642d792abfcad1b08a
  GVRAudioSDK: 302f0a8f190d855868ea07f246ce4f9b44c392ae
  GVRSDK: 0cb9d0ce06a84d698e61e3db9509766022dcf815
-  React: bfd693e2d08a61bf1dc056bba3f5c01a13a3cc31
+  React: aa2040dbb6f317b95314968021bd2888816e03d5
  react-native-image-picker: 42cfe2c8435d893414f8714a81e480313cb1412b
  react-native-maps: 066c2afcc89e18726377bcc685315f989ca22449
  ViroKit: 9631f301ef6a3f56116b23d6aac5d5c2307aa368
  ViroReact: 5520f26ac4654e361786c82da3b29ce0402c3c00
-  yoga: 17521bbb0dd54a47c0b3ac43253e78cdac7488e0
+  yoga: a23273df0088bf7f2bb7e5d7b00044ea57a2a54a

-PODFILE CHECKSUM: 6a4957d8115688cbb9e33db130bb6936259d12be
+PODFILE CHECKSUM: bf7fd2f2a19c210b54a09cfb216d5f930cf6601c

-COCOAPODS: 1.5.0.beta.1
+COCOAPODS: 1.5.0