cocoapods-fix-react-native 2018.05.03.10 → 2018.05.03.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e61ae67e2d6bd5f2e0327bb13bde287c03507fcc1bea282563cb68fee5f62c5
-  data.tar.gz: e6b3aef3de1f2a673b2246a344b67154e444059f43b4f9149babafd80866e0a9
+  metadata.gz: 20e64ade78568578b3c9af60bcccc3125464dd19fc1227709d5855fb1ad946e5
+  data.tar.gz: 3e89ca1f4b9bea94a7ed49bfc340be2386d0f3c95766147f91a6215a429af705
 SHA512:
-  metadata.gz: ed78330f5a4a09f5088e57525c16236f58ef9d0cb82d0e93aa9eef7f064357a14429343b381c0e9ea348e596508b107dba055254ca993d11010780f719ae3502
-  data.tar.gz: 71a807a28d9c5c953d82a7a8635709b12d8ddcbd8ce93eb607f08d37f03a4e64b2549245e28dd5717383274adabaf051d550a04781ff0b28dd4763ba80ceddc7
+  metadata.gz: cdac39965eef4dd8dfd8612ed8e342d11289c36f2df06f52d7ad8381ee1d523936fd1d3d19df12325e922391c9c705c10eed7149956099988b9f3672dfa2e653
+  data.tar.gz: c53fe8388eff3a8da82c1ad5bcc3d1bd0c556b01352aa16cb8b5406da2d1682f737c76a61eee5896cbfcad748cbd2f9515939feaa4b75d7517581029a63e563f

data/lib/cocoapods-fix-react-native/fix_with_context.rb

@@ -43,17 +43,22 @@ class CocoaPodsFixReactNative
       Pod::Config.instance.sources_manager.source_with_name_or_url(source)
     end
 
-    resolver = Pod::Resolver.new(context.sandbox, context.podfile, locked_dependencies, sources, true)
-    target_definitions = resolver.resolve
-
     react_spec = nil
+    
+    begin
+      resolver = Pod::Resolver.new(context.sandbox, context.podfile, locked_dependencies, sources, true)
+      target_definitions = resolver.resolve
 
-    target_definitions.each do |(definition, dependencies)|
-      next if definition.name == 'Pods'
+      target_definitions.each do |(definition, dependencies)|
+        next if definition.name == 'Pods'
 
-      react = dependencies.find { |d| d.spec.name == 'React' || d.spec.name.start_with?('React/') }
-      next if react.nil?
-      react_spec = react.spec
+        react = dependencies.find { |d| d.spec.name == 'React' || d.spec.name.start_with?('React/') }
+        next if react.nil?
+        react_spec = react.spec
+      end
+    rescue StandardError => e
+      Pod::UI.warn 'Failed to resolve dependencies, so pre-patch was not applied, ' +
+                   'please try running `pod install` again to apply the patch.'
     end
 
     return if react_spec.nil?

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

@@ -0,0 +1,165 @@
+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_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[30].include? '&'
+    Pod::UI.message "Patching #{filepath}", '- '
+    contents.insert(27, '#ifdef __cplusplus')
+    contents[34] = '#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'
+    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
+fix_cplusplus_header_compiler_error
+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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-fix-react-native
 version: !ruby/object:Gem::Version
-  version: 2018.05.03.10
+  version: 2018.05.03.12
 platform: ruby
 authors:
 - Orta Therox
@@ -58,6 +58,7 @@ files:
 - lib/cocoapods-fix-react-native/versions/0_53_3.rb
 - 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_plugin.rb
 - spec/command/native_spec.rb
 - spec/spec_helper.rb