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
c560e1be
Commit
c560e1be
authored
Oct 04, 2014
by
Thomas Visser
Committed by
Samuel E. Giddins
Oct 07, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Resolver] Take into account versions from all sources (CocoaPods/CocoaPods#2556)
parent
77f29854
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
CHANGELOG.md
CHANGELOG.md
+5
-0
resolver.rb
lib/cocoapods/resolver.rb
+4
-4
No files found.
CHANGELOG.md
View file @
c560e1be
...
...
@@ -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
...
...
lib/cocoapods/resolver.rb
View file @
c560e1be
...
...
@@ -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
...
...
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