Skip to content

fix: change how relative path to podfile is created #625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 8, 2019
Merged

fix: change how relative path to podfile is created #625

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions packages/platform-ios/native_modules.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# which declare themselves to be iOS dependencies (via having a Podspec) and automatically
# imports those into your current target.
#
require 'pathname'

def use_native_modules!(root = "..", config = nil)
if (!config)
json = []
Expand All @@ -20,7 +22,7 @@ def use_native_modules!(root = "..", config = nil)
end

packages = config["dependencies"]
project_root = config["root"]
config_root = config["root"]
found_pods = []

packages.each do |package_name, package|
Expand Down Expand Up @@ -54,7 +56,9 @@ def use_native_modules!(root = "..", config = nil)
existing_dep.name.split('/').first == spec.name
end

relative_path = File.dirname(podspec_path).split(project_root).last || ""
podspec_dir_path = Pathname.new(File.dirname(podspec_path))
project_root = Pathname.new(config_root)
relative_path = podspec_dir_path.relative_path_from project_root

pod spec.name, :path => File.join(root, relative_path)

Expand Down Expand Up @@ -217,10 +221,10 @@ def pluralize(count)
end

it "prints out the native module pods that were found" do
@podfile.use_native_modules('..', { "root" => "", "dependencies" => {} })
@podfile.use_native_modules('..', { "root" => "", "dependencies" => { "pkg-1" => @ios_package }})
@podfile.use_native_modules('..', { "root" => "/root/app", "dependencies" => {} })
@podfile.use_native_modules('..', { "root" => "/root/app", "dependencies" => { "pkg-1" => @ios_package }})
@podfile.use_native_modules('..', {
"root" => "", "dependencies" => { "pkg-1" => @ios_package, "pkg-2" => @ios_package }
"root" => "/root/app", "dependencies" => { "pkg-1" => @ios_package, "pkg-2" => @ios_package }
})
@printed_messages.must_equal [
"Detected React Native module pod for ios-dep",
Expand Down