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
a1799f05
Unverified
Commit
a1799f05
authored
Jan 22, 2018
by
Dimitris Koutsogiorgas
Committed by
GitHub
Jan 22, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7353 from dnkoutso/uniq_prerelease_versions
Unique all available pre-release versions when displaying
parents
b0ecb70b
71f8fc17
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
CHANGELOG.md
CHANGELOG.md
+4
-0
resolver.rb
lib/cocoapods/resolver.rb
+1
-1
No files found.
CHANGELOG.md
View file @
a1799f05
...
@@ -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
)
...
...
lib/cocoapods/resolver.rb
View file @
a1799f05
...
@@ -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
<<
"
\n
There are only pre-release versions available satisfying the following requirements:
\n
"
o
<<
"
\n
There 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
...
...
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