Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
9d3049a0
Commit
9d3049a0
authored
Sep 17, 2015
by
Muhammed Yavuz Nuzumlali
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Code formatting. CHANGELOG update.
parent
35afbc7c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
CHANGELOG.md
CHANGELOG.md
+6
-0
resolver.rb
lib/cocoapods/resolver.rb
+6
-1
No files found.
CHANGELOG.md
View file @
9d3049a0
...
@@ -9,6 +9,12 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -9,6 +9,12 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes
##### Bug Fixes
*
Use watchsimulator when validating pods with the watchOS platform.
*
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
)
[
Thomas Kollbach
](
https://github.com/toto
)
[
#4130
](
https://github.com/CocoaPods/CocoaPods/issues/4130
)
[
#4130
](
https://github.com/CocoaPods/CocoaPods/issues/4130
)
...
...
lib/cocoapods/resolver.rb
View file @
9d3049a0
...
@@ -383,7 +383,12 @@ module Pod
...
@@ -383,7 +383,12 @@ module Pod
'version requirement to your Podfile '
\
'version requirement to your Podfile '
\
"(e.g. `pod '
#{
name
}
', '
#{
lockfile_reqs
.
map
(
&
:requirement
).
join
(
"', '"
)
}
'`) "
\
"(e.g. `pod '
#{
name
}
', '
#{
lockfile_reqs
.
map
(
&
:requirement
).
join
(
"', '"
)
}
'`) "
\
"or revert to a stable version by running `pod update
#{
name
}
`."
"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],
# Conflict was caused by not specifying an explicit version for the requirement #[name],
# and there is no available stable version for the requirement.
# and there is no available stable version for the requirement.
message
=
"There is no corresponding stable version for `
#{
name
}
`. "
\
message
=
"There is no corresponding stable version for `
#{
name
}
`. "
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment