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
83b374d7
Commit
83b374d7
authored
Oct 24, 2014
by
Samuel E. Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Resolver][LazySpecification] Use new raise_if_missing parameter to subspec_by_name
parent
33c88fc7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
10 deletions
+4
-10
Gemfile.lock
Gemfile.lock
+1
-1
resolver.rb
lib/cocoapods/resolver.rb
+1
-7
lazy_specification.rb
lib/cocoapods/resolver/lazy_specification.rb
+2
-2
No files found.
Gemfile.lock
View file @
83b374d7
...
@@ -7,7 +7,7 @@ GIT
...
@@ -7,7 +7,7 @@ GIT
GIT
GIT
remote: https://github.com/CocoaPods/Core.git
remote: https://github.com/CocoaPods/Core.git
revision:
dad46458c14c2ddf717d9d0fd49c0c18e4e13617
revision:
86c02faa738990d2ab10bbe07339de681637f8b4
branch: resolver
branch: resolver
specs:
specs:
cocoapods-core (0.34.4)
cocoapods-core (0.34.4)
...
...
lib/cocoapods/resolver.rb
View file @
83b374d7
...
@@ -106,13 +106,7 @@ module Pod
...
@@ -106,13 +106,7 @@ module Pod
specs
=
find_cached_set
(
dependency
).
specs
=
find_cached_set
(
dependency
).
all_specifications
.
all_specifications
.
select
{
|
s
|
dependency
.
requirement
.
satisfied_by?
s
.
version
}.
select
{
|
s
|
dependency
.
requirement
.
satisfied_by?
s
.
version
}.
map
do
|
s
|
map
{
|
s
|
s
.
subspec_by_name
(
dependency
.
name
,
false
)
}
begin
s
.
subspec_by_name
dependency
.
name
rescue
nil
end
end
.
compact
specs
.
specs
.
reverse
.
reverse
.
...
...
lib/cocoapods/resolver/lazy_specification.rb
View file @
83b374d7
...
@@ -14,11 +14,11 @@ module Pod
...
@@ -14,11 +14,11 @@ module Pod
specification
.
send
(
method
,
*
args
,
&
block
)
specification
.
send
(
method
,
*
args
,
&
block
)
end
end
def
subspec_by_name
(
name
=
nil
)
def
subspec_by_name
(
name
=
nil
,
raise_if_missing
=
true
)
if
!
name
||
name
==
self
.
name
if
!
name
||
name
==
self
.
name
self
self
else
else
specification
.
subspec_by_name
(
name
)
specification
.
subspec_by_name
(
name
,
raise_if_missing
)
end
end
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