Commit c560e1be authored by Thomas Visser's avatar Thomas Visser Committed by Samuel E. Giddins

[Resolver] Take into account versions from all sources (CocoaPods/CocoaPods#2556)

parent 77f29854
......@@ -60,6 +60,11 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
[Kyle Fuller](https://github.com/kylef)
[#2591](https://github.com/CocoaPods/CocoaPods/issues/2591)
* Take into account versions of a Pod from all specified sources when
resolving dependencies.
[Thomas Visser](https://github.com/Thomvis)
[#2556](https://github.com/CocoaPods/CocoaPods/issues/2556)
## 0.34.1
......
......@@ -76,7 +76,6 @@ module Pod
specs_by_target
end
# @return [Hash{Podfile::TargetDefinition => Array<Specification>}]
# returns the resolved specifications grouped by target.
#
......@@ -194,6 +193,7 @@ module Pod
end
cached_sets[name] = set
unless set
binding.pry
raise Informative, 'Unable to find a specification for ' \
"`#{dependency}` depended upon by #{dependent_spec}."
end
......@@ -209,9 +209,9 @@ module Pod
# The dependency for which the set is needed.
#
def find_set_from_sources(dependency)
sources.each do |source|
set = source.search(dependency)
return set if set
matching_sources = sources.select { |source| source.pods.include? dependency.root_name }
unless matching_sources.empty?
return Specification::Set.new(dependency.root_name, matching_sources)
end
nil
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment