cocoapods-fix-react-native 2018.04.01.16 → 2018.04.01.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1f43a7f65ef774c954ccd90a5b7ab1d3449e4684003df50b4b59daddeb88241
-  data.tar.gz: 539c82b1163f6f822031585b4c54a1fe97c566466ef3210ef35d1d291fff5dfd
+  metadata.gz: 909cc9e8295d7fa0da87935d9fe3972916e14542c42631505505d85af7cadb17
+  data.tar.gz: b7f55a3992638707eb71d786e1d1092df0698c7f26e4d3dfef7dd718c54b0588
 SHA512:
-  metadata.gz: e754efc68132ba0123c2fdb82541c9a6d3be05f82b70bc4b007b96016bd790ee66f404e7163d168bf27e7001f14d716c0555d61d9557e242928997d373bb9046
-  data.tar.gz: 39a36d5382250facb29740cf8d631d26b29910375f343f7da9f3cb4b9d74e5537352169cbde954a4782f69f90652debba5f58203e66e9f68b8481e3fde7878a6
+  metadata.gz: 0478326384b5b8c10ef60ed230bfc1d3d17e1a31e90ec64d117c74e0beae97ed66cb4ec6b004e3dfb7f4d6c64ebd6ba0571f4e23cafece8d1e1fcd460fc07ddd
+  data.tar.gz: 49b762c238078aa6ec608d3a4f1e502cb63de81c9fa7bfedb748ef502edd2b3ea7bc839b132368004440382aa120f2d8e838d193f5807fb777f7b005b53284e0

data/README.md

@@ -1,4 +1,4 @@
-Hi there! This a CocoaPods plugin that _we, the community_, can use to plug the holes in React Native's CocoaPods
+Hi there! This a CocoaPods plugin that **we, the community**, can use to plug the holes in React Native's CocoaPods
 support.
 
 CocoaPods allows you to add code to run at the end of the Podfile via a `post_install` hook. You probably already have
@@ -15,8 +15,8 @@ Swift, you're pretty far from their workflow.
 In order to get it working for just you app you scour, like, a million issues on React Native (or go look at
 [artsy/eigen][eigen]) to get it compiling on your setup. Again, not optimal.
 
-This plugin _tries_ to fix this by centralizing the code needed to modify React Native. This means makes it easy to update
-your versions of React Native, because you can update the gem at the same time.
+This plugin _tries_ to fix this by centralizing the code needed to modify React Native. This means makes it easy to
+update your versions of React Native, because you can update the gem at the same time.
 
 ## Installation
 
@@ -70,9 +70,11 @@ underscores. E.g. `0.54.4` -> `0_54_4.rb`.
 The scripts itself should be entirely self contained, so that it's easy to understand wthout learning the project.
 
 The biggest change you'd need to make from the sort of code you can find inside the issues is that it needs to support
-many different potential roots. So instead of just `Pods/` - it wants to also handle `node_modules/react-native` and
-`../node_modules/react-native`. This can be done by removing `'Pods'` from the path and wrapping it with a
-`File.join(root, 'Path/InReactLib.js')`.
+many different potential roots. So instead of just `Pods/React/*` - this plugin will also handle
+`node_modules/react-native/*` and `../node_modules/react-native/*`. Basically, your dev repo, and your prod app.
+
+This can be done by removing `'Pods/React'` from the path and wrapping it with a
+`File.join(root, 'Path/InReactLib.js')`. You'll see this in the current scripts.
 
 ### Getting Setup To Improve
 
@@ -98,4 +100,4 @@ As `use_frameworks!` is more strict than static libraries, I'd recommend working
 frameworks.
 
 [eigen]: https://github.com/artsy/eigen/
-[versions]: lib/cocoapods-fix-react-native/versions/
+[versions]: https://github.com/orta/cocoapods-fix-react-native/tree/master/lib/cocoapods-fix-react-native/versions

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

@@ -1,3 +1,8 @@
+# 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')
 
@@ -6,15 +11,15 @@ 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'
+$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
+  $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)
+  file = File.join($root, path)
   code = File.read(file)
   if code.include?(old_code)
     FileUtils.chmod('+w', file)
@@ -23,7 +28,7 @@ def edit_pod_file(path, old_code, new_code)
 end
 
 def fix_cplusplus_header_compiler_error
-  filepath = File.join(root, 'Pods/React/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h')
+  filepath = File.join($root, 'React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.h')
   FileUtils.chmod('+w', filepath)
 
   contents = []
@@ -72,15 +77,15 @@ fix_unused_yoga_headers
 fix_cplusplus_header_compiler_error
 
 # https://github.com/facebook/react-native/pull/14664
-animation_view_file = 'React/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h'
+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
-if File.exist?(File.join(root, 'React/Libraries/WebSocket/RCTReconnectingWebSocket.m'))
-  websocket = 'React/Libraries/WebSocket/RCTReconnectingWebSocket.m'
+if File.exist?(File.join($root, 'Libraries/WebSocket/RCTReconnectingWebSocket.m'))
+  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
@@ -88,8 +93,8 @@ end
 
 # Newer build of Xcode don't allow you to set a non-obj to be strong,
 # so this instead changes it to be an assign.
-module_data_file = 'React/React/Base/RCTModuleData.h'
-bridge_module_file = 'React/React/Base/RCTBridgeModule.h'
+module_data_file = 'React/Base/RCTModuleData.h'
+bridge_module_file = 'React/Base/RCTBridgeModule.h'
 method_queue_old_code = '(nonatomic, strong, readonly) dispatch_queue_t methodQueue'
 method_queue_new_code = '(nonatomic, assign, readonly) dispatch_queue_t methodQueue'
 edit_pod_file module_data_file, method_queue_old_code, method_queue_new_code

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-fix-react-native
 version: !ruby/object:Gem::Version
-  version: 2018.04.01.16
+  version: 2018.04.01.19
 platform: ruby
 authors:
 - Orta Therox