cocoapods-fix-react-native 2018.04.03.21 → 2018.04.05.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccc5630d762156d05882147021bd560774258caceaa5b1e83f4b3f829429dacb
-  data.tar.gz: f05cabbb527eddf403309e59b23c9b4fbaa5fce9c42bcde75d9352709217974a
+  metadata.gz: 109c41521da8261b83ca9c3afb893d6f4560ed6f62c5ab6bbc74adeec1005531
+  data.tar.gz: 61d9e617135d8aa1a73fd0e9f4e916697b63a97aa3b9dac3672d25ccd7cc11c2
 SHA512:
-  metadata.gz: c1440ec80bdf92409edde234598708a39ad9c972d0deab9066a428ca94a866ea95657cfd48eccb5ebf3418798dfd13a140981f3dd668012d1e557a1cdf9fa334
-  data.tar.gz: 0d8b2c6339a6fd78a3b23e5cd143adb5c146e99d4fda61b9b05eb379d1efea317f4a6d66a472622879b73d19d03d9af5111a845ee511b0ac099c18fbedbd1d0d
+  metadata.gz: be53638fa0dd64c257afd16fec0795ddcd6877000ef7ac48662018e999d8b8028c73fa5ebad021668b33ba5258173a142b865d9cdb62a4384a44e4d55feb9254
+  data.tar.gz: e6b54222d96a7c3e0a859487436721323940e9b571c9f157f88b89c4a926decdae47f80703f031796a88f2181f1e730c2f94f08359473adca747b7f489da0b3a

data/lib/cocoapods-fix-react-native/versions/0_54_2.rb

@@ -0,0 +1,120 @@
+# Notes:
+#
+#  - All file paths should be relative to the React repo, rather than the Pods dir, or node_modules
+#
+
+# Are you using :path based Pods?
+dev_pods_react = !File.directory?('Pods/React/React')
+
+# Check for whether
+same_repo_node_modules = File.directory?('node_modules/react-native')
+previous_repo_node_modules = File.directory?('../node_modules/react-native')
+
+# Find out where the files could be rooted
+$root = 'Pods/React'
+if dev_pods_react
+  $root = 'node_modules/react-native' if same_repo_node_modules
+  $root = '../node_modules/react-native' if previous_repo_node_modules
+end
+
+# TODO: move to be both file in pods and file in node_mods?
+def edit_pod_file(path, old_code, new_code)
+  file = File.join($root, path)
+  code = File.read(file)
+  if code.include?(old_code)
+    FileUtils.chmod('+w', file)
+    File.write(file, code.sub(old_code, new_code))
+  end
+end
+
+def fix_cplusplus_header_compiler_error
+  filepath = File.join($root, 'React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h')
+  FileUtils.chmod('+w', filepath)
+
+  contents = []
+
+  file = File.open(filepath, 'r')
+  file.each_line do |line|
+    contents << line
+  end
+  file.close
+
+  if contents[32].include? '&'
+    contents.insert(26, '#ifdef __cplusplus')
+    contents[36] = '#endif'
+
+    file = File.open(filepath, 'w') do |f|
+      f.puts(contents)
+    end
+  end
+end
+
+def fix_unused_yoga_headers
+  filepath = 'Pods/Target Support Files/yoga/yoga-umbrella.h'
+  # This only exists when using CocoaPods + Frameworks
+  return unless File.exists?(filepath)
+
+  contents = []
+  file = File.open(filepath, 'r')
+  file.each_line do |line|
+    contents << line
+  end
+  file.close
+
+  if contents[12].include? 'Utils.h'
+    contents.delete_at(15) # #import "YGNode.h"
+    contents.delete_at(15) # #import "YGNodePrint.h"
+    contents.delete_at(15) # #import "Yoga-internal.h"
+    contents.delete_at(12) # #import "Utils.h"
+
+    file = File.open(filepath, 'w') do |f|
+      f.puts(contents)
+    end
+  end
+end
+
+fix_unused_yoga_headers
+fix_cplusplus_header_compiler_error
+
+# https://github.com/facebook/react-native/pull/14664
+animation_view_file = 'Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h'
+animation_view_old_code = 'import <RCTAnimation/RCTValueAnimatedNode.h>'
+animation_view_new_code = 'import "RCTValueAnimatedNode.h"'
+edit_pod_file animation_view_file, animation_view_old_code, animation_view_new_code
+
+# https://github.com/facebook/react-native/issues/13198
+# Only needed when you have the DevSupport subspec
+has_dev_support = File.exist?(File.join($root, 'Libraries/WebSocket/RCTReconnectingWebSocket.m'))
+
+if has_dev_support
+  # Move Fishhook to be based on RN's imports
+  websocket = 'Libraries/WebSocket/RCTReconnectingWebSocket.m'
+  websocket_old_code = 'import <fishhook/fishhook.h>'
+  websocket_new_code = 'import <React/fishhook.h>'
+  edit_pod_file websocket, websocket_old_code, websocket_new_code
+else
+  # There's a link in the DevSettings to dev-only import
+  filepath = "#{$root}/React/Modules/RCTDevSettings.mm"
+  contents = []
+  file = File.open(filepath, 'r')
+  found = false
+  file.each_line do |line|
+    contents << line
+  end
+  file.close
+
+  comment_start = '#if ENABLE_PACKAGER_CONNECTION'
+  comment_end = '#endif'
+
+  if contents[22].rstrip != comment_start
+    contents.insert(22, comment_start)
+    contents.insert(24, comment_end)
+
+    contents.insert(207, comment_start)
+    contents.insert(231, comment_end)
+  end
+
+  file = File.open(filepath, 'w') do |f|
+    f.puts(contents)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-fix-react-native
 version: !ruby/object:Gem::Version
-  version: 2018.04.03.21
+  version: 2018.04.05.17
 platform: ruby
 authors:
 - Orta Therox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,6 +54,7 @@ files:
 - cocoapods-fix-react-native.gemspec
 - lib/cocoapods-fix-react-native.rb
 - lib/cocoapods-fix-react-native/version_resolver.rb
+- lib/cocoapods-fix-react-native/versions/0_54_2.rb
 - lib/cocoapods-fix-react-native/versions/0_54_4.rb
 - lib/cocoapods_plugin.rb
 - spec/command/native_spec.rb