Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FastSquircle.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require_relative './scripts/cocoapods_utils'

package = JSON.parse(File.read(File.join(__dir__, "package.json")))

$config = find_config()
$config = fast_squircle_find_config()
version_flags = "-DREACT_NATIVE_MINOR_VERSION=#{$config[:react_native_minor_version]}"

Pod::Spec.new do |s|
Expand Down
8 changes: 4 additions & 4 deletions scripts/cocoapods_utils.rb
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
def try_to_parse_react_native_package_json(node_modules_dir)
def fast_squircle_try_to_parse_react_native_package_json(node_modules_dir)
react_native_package_json_path = File.join(node_modules_dir, 'react-native/package.json')
if !File.exist?(react_native_package_json_path)
return nil
end
return JSON.parse(File.read(react_native_package_json_path))
end

def find_config()
def fast_squircle_find_config()
result = {
:react_native_version => nil,
:react_native_minor_version => nil,
}

react_native_node_modules_dir = File.join(File.dirname(`cd "#{Pod::Config.instance.installation_root.to_s}" && node --print "require.resolve('react-native/package.json')"`), '..')
react_native_json = try_to_parse_react_native_package_json(react_native_node_modules_dir)
react_native_json = fast_squircle_try_to_parse_react_native_package_json(react_native_node_modules_dir)

if react_native_json == nil
# user configuration, just in case
node_modules_dir = ENV["REACT_NATIVE_NODE_MODULES_DIR"]
react_native_json = try_to_parse_react_native_package_json(node_modules_dir)
react_native_json = fast_squircle_try_to_parse_react_native_package_json(node_modules_dir)
end

if react_native_json == nil
Expand Down
Loading