Code formatting. CHANGELOG update.

parent 35afbc7c
......@@ -9,6 +9,12 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes
* Use watchsimulator when validating pods with the watchOS platform.
* Give a meaningful message for the case where there is no available stable version for a pod,
and user do not explicitly specify the required version.
[Muhammed Yavuz Nuzumlalı](https://github.com/manuyavuz)
[#4197](https://github.com/CocoaPods/CocoaPods/issues/4197)
* Use watchsimulator when validatng PodSpecs with watchOS compatibility.
[Thomas Kollbach](https://github.com/toto)
[#4130](https://github.com/CocoaPods/CocoaPods/issues/4130)
......
......@@ -383,7 +383,12 @@ module Pod
'version requirement to your Podfile ' \
"(e.g. `pod '#{name}', '#{lockfile_reqs.map(&:requirement).join("', '")}'`) " \
"or revert to a stable version by running `pod update #{name}`."
elsif (conflict.possibility && conflict.possibility.version.prerelease?) && (conflict.requirement && !(conflict.requirement.prerelease? || conflict.requirement.external_source || conflict.requirement.head?))
elsif (conflict.possibility && conflict.possibility.version.prerelease?) &&
(conflict.requirement && !(
conflict.requirement.prerelease? ||
conflict.requirement.external_source ||
conflict.requirement.head?)
)
# Conflict was caused by not specifying an explicit version for the requirement #[name],
# and there is no available stable version for the requirement.
message = "There is no corresponding stable version for `#{name}`. " \
......
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