Skip to content
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.

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

[Resolver] Allow platform detection to work for nested dependencies #4097

Merged
merged 3 commits into from
Sep 2, 2015

Conversation

segiddins
Copy link
Member

Closes #4084.

  • Test
  • CHANGELOG

@@ -532,7 +532,7 @@ def resolve_dependencies
end

specs_by_target = nil
UI.section "Resolving dependencies of #{UI.path podfile.defined_in_file}" do
UI.section "Resolving dependencies of #{UI.path(podfile.defined_in_file) || 'Podfile'}" do
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change seems unrelated? Also, shouldn't podfile.defined_in_file always have a value?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not when linting

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Which is what prompted this PR, so I made that change whilst debugging)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@segiddins
Copy link
Member Author

Please review @kylef , this should be mergable.

@kylef
Copy link
Contributor

kylef commented Sep 1, 2015

Good, but it needs to be 🍏 green.

@segiddins
Copy link
Member Author

Will be green once #4104 (comment) is merged

segiddins added a commit that referenced this pull request Sep 2, 2015
[Resolver] Allow platform detection to work for nested dependencies
@segiddins segiddins merged commit 2919cde into master Sep 2, 2015
@segiddins segiddins deleted the seg-resolver-platforms-fix branch September 2, 2015 05:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants