cocoapods-fix-react-native 2018.05.08.12 → 2018.05.15.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d452130716e5b82aea3c9aa20b5bd298c85d791ae01ec3235878d9391cfbe4e
-  data.tar.gz: 64c364164538ce87679fe68f8e2b80ab5096fd19951b9440e26362fe4c15bdb5
+  metadata.gz: f0c24a7e0935483ebcfb923f5c77113726c4911bc194909c1c0bb06e0db44b50
+  data.tar.gz: 51757c7b80287a270844c41ac7fd58ac68abe2ae6db438a2994346e5b81b836a
 SHA512:
-  metadata.gz: b51d3d997cbfd1a166dd3785a13766fc6ebd01300dd0adae369a8bffb27060a4636ae3b776e54a275b5e82cce4e559881681d6789f75e46e92ece544bdb3341d
-  data.tar.gz: 4d84dc504f859de11658f7f6790595c40e649442c07f4b1028985ce121a9ab0ea28cf9cb473d9205edc9b3aea445328ba71cce8df3a6496cdb876082eed6f01c
+  metadata.gz: 71d0bc6687243ed39896e4bda09dcb1aa600bf9b6aa4078bd8925574bdd377aa1b2df21a28edee47b48e23ade184a6b16a71426df5fa1a91f48b8f57d236fffa
+  data.tar.gz: 2110e976a1e16ad18c73400a1adc327e9c0b6d9520339b10e1e9848429d9324ffaca2c635275ee4d2c6b0c189d79670cdcb6f6907e295c24c4202c25f9bdea55

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

@@ -0,0 +1,141 @@
+require 'cocoapods'
+
+# 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')
+
+# Detect CocoaPods + Frameworks
+$has_frameworks = File.exists?'Pods/Target Support Files/React/React-umbrella.h'
+
+# Check for whether we're in a project that uses relative paths
+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 patch_pod_file(path, old_code, new_code)
+  file = File.join($root, path)
+  unless File.exist?(file)
+    Pod::UI.warn "#{file} does not exist so was not patched.."
+    return
+  end
+  code = File.read(file)
+  if code.include?(old_code)
+    Pod::UI.message "Patching #{file}", '- '
+    FileUtils.chmod('+w', file)
+    File.write(file, code.sub(old_code, new_code))
+  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'
+    Pod::UI.message "Patching #{filepath}", '- '
+    contents.delete_at(14) # #import "YGLayout.h"
+    contents.delete_at(15) # #import "YGNode.h"
+    contents.delete_at(15) # #import "YGNodePrint.h"
+    contents.delete_at(15) # #import "YGStyle.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
+
+# Detect source file dependency in the generated Pods.xcodeproj workspace sub-project
+def has_pods_project_source_file(source_filename)
+  pods_project = 'Pods/Pods.xcodeproj/project.pbxproj'
+  File.open(pods_project).grep(/#{source_filename}/).any?
+end
+
+# Detect dependent source file required for building when the given source file is present
+def meets_pods_project_source_dependency(source_filename, dependent_source_filename)
+  has_pods_project_source_file(source_filename) ? has_pods_project_source_file(dependent_source_filename) : true
+end
+
+def detect_missing_subspec_dependency(subspec_name, source_filename, dependent_source_filename)
+  unless meets_pods_project_source_dependency(source_filename, dependent_source_filename)
+    Pod::UI.warn "#{subspec_name} subspec may be required given your current dependencies"
+  end
+end
+
+def detect_missing_subspecs
+  return unless $has_frameworks
+
+  # For CocoaPods + Frameworks, RCTNetwork and CxxBridge subspecs are necessary for DevSupport.
+  # When the React pod is generated it must include all the required source, and see umbrella deps.
+  detect_missing_subspec_dependency('RCTNetwork', 'RCTBlobManager.mm', 'RCTNetworking.mm')
+  detect_missing_subspec_dependency('CxxBridge', 'RCTJavaScriptLoader.mm', 'RCTCxxBridge.mm')
+
+  # RCTText itself shouldn't require DevSupport, but it depends on Core -> RCTDevSettings -> RCTPackagerClient
+  detect_missing_subspec_dependency('DevSupport', 'RCTDevSettings.mm', 'RCTPackagerClient.m')
+end
+
+fix_unused_yoga_headers
+detect_missing_subspecs
+
+# # 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"'
+patch_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>'
+  patch_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[20].include? 'RCTPackagerClient.h'
+    Pod::UI.message "Patching #{filepath}", '- '
+    contents.insert(20, comment_start)
+    contents.insert(22, comment_end)
+
+    contents.insert(205, comment_start)
+    contents.insert(229, comment_end)
+
+    file = File.open(filepath, 'w') do |f|
+      f.puts(contents)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-fix-react-native
 version: !ruby/object:Gem::Version
-  version: 2018.05.08.12
+  version: 2018.05.15.11
 platform: ruby
 authors:
 - Orta Therox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-08 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,7 @@ files:
 - lib/cocoapods-fix-react-native/versions/0_54_2-post.rb
 - lib/cocoapods-fix-react-native/versions/0_54_4-post.rb
 - lib/cocoapods-fix-react-native/versions/0_55_3-post.rb
+- lib/cocoapods-fix-react-native/versions/0_55_4-post.rb
 - lib/cocoapods_plugin.rb
 - spec/command/native_spec.rb
 - spec/spec_helper.rb