Unverified Commit a1799f05 authored by Dimitris Koutsogiorgas's avatar Dimitris Koutsogiorgas Committed by GitHub

Merge pull request #7353 from dnkoutso/uniq_prerelease_versions

Unique all available pre-release versions when displaying
parents b0ecb70b 71f8fc17
...@@ -18,6 +18,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -18,6 +18,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes ##### Bug Fixes
* Unique all available pre-release versions when displaying
[Samuel Giddins](https://github.com/segiddins)
[#7353](https://github.com/CocoaPods/CocoaPods/pull/7353)
* Do not attempt compilation for pods with no sources and skipping import validation * Do not attempt compilation for pods with no sources and skipping import validation
[Dimitris Koutsogiorgas](https://github.com/dnkoutso) [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#7336](https://github.com/CocoaPods/CocoaPods/issues/7336) [#7336](https://github.com/CocoaPods/CocoaPods/issues/7336)
......
...@@ -477,7 +477,7 @@ module Pod ...@@ -477,7 +477,7 @@ module Pod
# Conflict was caused by not specifying an explicit version for the requirement #[name], # Conflict was caused by not specifying an explicit version for the requirement #[name],
# and there is no available stable version satisfying constraints for the requirement. # and there is no available stable version satisfying constraints for the requirement.
o << "\nThere are only pre-release versions available satisfying the following requirements:\n" o << "\nThere are only pre-release versions available satisfying the following requirements:\n"
conflict.requirements.values.flatten.each do |r| conflict.requirements.values.flatten.uniq.each do |r|
unless search_for(r).empty? unless search_for(r).empty?
o << "\n\t'#{name}', '#{r.requirement}'\n" o << "\n\t'#{name}', '#{r.requirement}'\n"
end 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