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
8135b8c1
Commit
8135b8c1
authored
Jul 25, 2016
by
arida
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modify for
https://github.com/CocoaPods/CocoaPods/pull/5578
parent
5f26568f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
CHANGELOG.md
CHANGELOG.md
+4
-4
resolver.rb
lib/cocoapods/resolver.rb
+6
-6
No files found.
CHANGELOG.md
View file @
8135b8c1
...
@@ -38,10 +38,6 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -38,10 +38,6 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
*
[
repo/push
]
--use-json to convert podspecs to JSON format when pushing.
*
[
repo/push
]
--use-json to convert podspecs to JSON format when pushing.
[
Mark Schall
](
https://github.com/maschall
)
[
Mark Schall
](
https://github.com/maschall
)
[
#5568
](
https://github.com/CocoaPods/CocoaPods/pull/5568
)
[
#5568
](
https://github.com/CocoaPods/CocoaPods/pull/5568
)
*
Improve the performance of resolve dependency.
[
yanzhiwei147
](
https://github.com/yanzhiwei147
)
[
#5510
](
https://github.com/CocoaPods/CocoaPods/pull/5510
)
*
Set 'Allow app extension API only' for Messages extensions.
*
Set 'Allow app extension API only' for Messages extensions.
[
Boris Bügling
](
https://github.com/neonichu
)
[
Boris Bügling
](
https://github.com/neonichu
)
...
@@ -71,6 +67,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -71,6 +67,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
*
Add a license type to generated acknowledgements file in plist.
*
Add a license type to generated acknowledgements file in plist.
[
Naoto Kaneko
](
https://github.com/naoty
)
[
Naoto Kaneko
](
https://github.com/naoty
)
[
#5436
](
https://github.com/CocoaPods/CocoaPods/pull/5436
)
[
#5436
](
https://github.com/CocoaPods/CocoaPods/pull/5436
)
*
Improve performance of dependency resolution.
[
yanzhiwei147
](
https://github.com/yanzhiwei147
)
[
#5510
](
https://github.com/CocoaPods/CocoaPods/pull/5510
)
##### Bug Fixes
##### Bug Fixes
...
...
lib/cocoapods/resolver.rb
View file @
8135b8c1
...
@@ -73,10 +73,10 @@ module Pod
...
@@ -73,10 +73,10 @@ module Pod
def
specs_by_target
def
specs_by_target
@specs_by_target
||=
{}.
tap
do
|
specs_by_target
|
@specs_by_target
||=
{}.
tap
do
|
specs_by_target
|
podfile
.
target_definition_list
.
each
do
|
target
|
podfile
.
target_definition_list
.
each
do
|
target
|
cached_dependency
s
=
{}
dependencie
s
=
{}
specs
=
target
.
dependencies
.
map
(
&
:name
).
flat_map
do
|
name
|
specs
=
target
.
dependencies
.
map
(
&
:name
).
flat_map
do
|
name
|
node
=
@activated
.
vertex_named
(
name
)
node
=
@activated
.
vertex_named
(
name
)
valid_dependencies_for_target_from_node
(
target
,
cached_dependency
s
,
node
)
<<
node
valid_dependencies_for_target_from_node
(
target
,
dependencie
s
,
node
)
<<
node
end
end
specs_by_target
[
target
]
=
specs
.
specs_by_target
[
target
]
=
specs
.
...
@@ -472,8 +472,8 @@ module Pod
...
@@ -472,8 +472,8 @@ module Pod
# An array of target-appropriate nodes whose `payload`s are
# An array of target-appropriate nodes whose `payload`s are
# dependencies for `target`.
# dependencies for `target`.
#
#
def
valid_dependencies_for_target_from_node
(
target
,
cached_dependency
s
,
node
)
def
valid_dependencies_for_target_from_node
(
target
,
dependencie
s
,
node
)
cache_dependency
=
cached_dependency
s
[
node
.
name
]
cache_dependency
=
dependencie
s
[
node
.
name
]
if
cache_dependency
if
cache_dependency
return
cache_dependency
return
cache_dependency
...
@@ -485,9 +485,9 @@ module Pod
...
@@ -485,9 +485,9 @@ module Pod
end
.
map
(
&
:destination
)
end
.
map
(
&
:destination
)
dependency_nodes
+
dependency_nodes
.
flat_map
do
|
item
|
dependency_nodes
+
dependency_nodes
.
flat_map
do
|
item
|
node_result
=
valid_dependencies_for_target_from_node
(
target
,
cached_dependency
s
,
item
)
node_result
=
valid_dependencies_for_target_from_node
(
target
,
dependencie
s
,
item
)
cached_dependency
s
[
item
.
name
]
=
node_result
dependencie
s
[
item
.
name
]
=
node_result
node_result
node_result
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