cocoapods-fix-react-native 2018.05.17.19 → 2018.07.04.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b357120784ba7a79928e4d0d1588dd36b92f44ba1fbcdc01e85f3da6bd2a51ec
-  data.tar.gz: 39f7daa2900eae16665461c4d8b1811138569d152b178575a2f13a6047003574
+  metadata.gz: 399a0e9ff7e6d7727caa8682c3fcecc047bc40a6d7fa60842aa6621a84ed948b
+  data.tar.gz: 93ae25c753da8c9b7c1730f636e420d49b7184986a4f4f52a2e8d14b3955679e
 SHA512:
-  metadata.gz: 04e360e6cf563ee39aabb5619befff8fbc0366230c66fb031b5d15bb253824c3b8e8ae658ee0cae9a254d011b89a453dd4217234ce0cb8a85feb02ddca47e065
-  data.tar.gz: 2ed6827ddc2978b571019f372683658ed627c09a07506910466802d6aa001d9dc096350724e3193b2965cfd1adbb2e7da18cfc8328a5d1dbc6bdede405ce952a
+  metadata.gz: 96dc61a8241e190bc5b29bd285b24a5f9c2437b3adf04db8f5cfd0c83e8df4b9f793fc8f07131d2f535b6f3fb781527471026bccdbd0fc4bfa5ce8178d2ecd9e
+  data.tar.gz: 349bcc32a884bc6a3694f7e5b2781204381bcb8a3069266eae631790739d387d6810839840c0050a6bae7579e31be98b0666d504c91c9dcd4e717c29cf422aa3

data/README.md

@@ -58,6 +58,13 @@ you can in your `Podfile`. This hook will first look at what version of React
 Native is installed, and will then run a corresponding scripts to make changes
 to the environment.
 
+## Custom React Native Root Directory
+
+To set a custom React Native root directory for dev an environment variable `COCOAPODS_FIX_REACT_NATIVE_DEV_ROOT` may be set.  Example:
+
+    # Some shell script that sets up environment variables
+    export COCOAPODS_FIX_REACT_NATIVE_DEV_ROOT="../my_react_project_directory/node_modules/react-native"
+
 ## Contributing Back
 
 You'll note that this repo has issues disabled, I'm not going to make the time

data/lib/cocoapods-fix-react-native/helpers/root_helper.rb

@@ -0,0 +1,32 @@
+# Notes:
+#
+#  - All file paths should be relative to the React repo, rather than the Pods dir, or node_modules
+#  - An enviroment variable of `COCOAPODS_FIX_REACT_NATIVE_DEV_ROOT` will override the defaults for dev.
+#
+#  - Returns the root directory to use for React Native
+
+def get_root
+  # Are you using :path based Pods?
+  dev_pods_react = !File.directory?('Pods/React/React')
+
+  # 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
+    # Use this as an override, if present and non empty string
+    $env_root = ENV["COCOAPODS_FIX_REACT_NATIVE_DEV_ROOT"]
+
+    if defined?($env_root) && ($env_root != nil) && ($env_root != '')
+      $root = $env_root
+    else
+      $root = 'node_modules/react-native' if same_repo_node_modules
+      $root = '../node_modules/react-native' if previous_repo_node_modules
+    end
+  end
+
+  return $root
+end

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

@@ -1,26 +1,11 @@
 require 'cocoapods'
+require 'cocoapods-fix-react-native/helpers/root_helper'
 
-# 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')
+# Obtain the React Native root directory
+$root = get_root
 
 # Detect CocoaPods + Frameworks
-$has_frameworks = File.exist?('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
+$has_frameworks = File.exists?'Pods/Target Support Files/React/React-umbrella.h'
 
 # TODO: move to be both file in pods and file in node_mods?
 def patch_pod_file(path, old_code, new_code)

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

@@ -1,21 +1,7 @@
-# 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
+require 'cocoapods-fix-react-native/helpers/root_helper'
+
+# Obtain the React Native root directory
+$root = get_root
 
 # TODO: move to be both file in pods and file in node_mods?
 def edit_pod_file(path, old_code, new_code)

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

@@ -1,27 +1,12 @@
 require 'cocoapods'
+require 'cocoapods-fix-react-native/helpers/root_helper'
 
-# 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')
+# Obtain the React Native root directory
+$root = get_root
 
 # 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)

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

@@ -1,27 +1,12 @@
 require 'cocoapods'
+require 'cocoapods-fix-react-native/helpers/root_helper'
 
-# 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')
+# Obtain the React Native root directory
+$root = get_root
 
 # 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)

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

@@ -1,27 +1,12 @@
 require 'cocoapods'
+require 'cocoapods-fix-react-native/helpers/root_helper'
 
-# 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')
+# Obtain the React Native root directory
+$root = get_root
 
 # 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)

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

@@ -0,0 +1,60 @@
+require 'cocoapods'
+require 'cocoapods-fix-react-native/helpers/root_helper'
+
+# Obtain the React Native root directory
+$root = get_root
+
+# Detect CocoaPods + Frameworks
+$has_frameworks = File.exists?'Pods/Target Support Files/React/React-umbrella.h'
+
+# 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
+
+# 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
+
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-fix-react-native
 version: !ruby/object:Gem::Version
-  version: 2018.05.17.19
+  version: 2018.07.04.16
 platform: ruby
 authors:
 - Orta Therox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,12 +54,14 @@ files:
 - cocoapods-fix-react-native.gemspec
 - lib/cocoapods-fix-react-native.rb
 - lib/cocoapods-fix-react-native/fix_with_context.rb
+- lib/cocoapods-fix-react-native/helpers/root_helper.rb
 - lib/cocoapods-fix-react-native/issues/react_dependency_version.rb
 - lib/cocoapods-fix-react-native/versions/0_53_3-post.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-fix-react-native/versions/0_55_4-post.rb
+- lib/cocoapods-fix-react-native/versions/0_56_0-post.rb
 - lib/cocoapods_plugin.rb
 - spec/command/native_spec.rb
 - spec/spec_helper.rb
@@ -83,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: CocoaPods plugin which automates hot-patching React Native