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
1ed0ca19
Commit
1ed0ca19
authored
Nov 21, 2016
by
Ben Asher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix framework support for cross-project targets
parent
ebed6002
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
10 deletions
+6
-10
analyzer.rb
lib/cocoapods/installer/analyzer.rb
+6
-10
No files found.
lib/cocoapods/installer/analyzer.rb
View file @
1ed0ca19
...
...
@@ -238,18 +238,14 @@ module Pod
#
def
copy_embedded_target_pod_targets_to_host
(
aggregate_target
,
embedded_aggregate_targets
)
return
if
aggregate_target
.
requires_host_target?
# Get the uuids of the aggregate_target's user_targets' embedded targets if any
embedded_uuids
=
Set
.
new
(
aggregate_target
.
user_targets
.
map
do
|
target
|
aggregate_target
.
user_project
.
embedded_targets_in_native_target
(
target
).
map
(
&
:uuid
)
end
.
flatten
)
return
if
embedded_uuids
.
empty?
embedded_aggregate_targets
.
each
do
|
embedded_target
|
next
unless
embedded_target
.
user_targets
.
map
(
&
:uuid
).
any?
do
|
embedded_uuid
|
embedded_uuids
.
include?
embedded_uuid
pod_target_names
=
aggregate_target
.
pod_targets
.
map
(
&
:name
)
aggregate_user_target_uuids
=
Set
.
new
aggregate_target
.
user_targets
.
map
(
&
:uuid
)
embedded_aggregate_targets
.
each
do
|
embedded_aggregate_target
|
next
unless
embedded_aggregate_target
.
user_targets
.
any?
do
|
embedded_user_target
|
!
aggregate_user_target_uuids
.
intersection
(
Set
.
new
(
aggregate_target
.
user_project
.
host_targets_for_embedded_target
(
embedded_user_target
).
map
(
&
:uuid
))).
empty?
end
pod_target_names
=
aggregate_target
.
pod_targets
.
map
(
&
:name
)
# This embedded target is hosted by the aggregate target's user_target; copy over the non-duplicate pod_targets
aggregate_target
.
pod_targets
=
aggregate_target
.
pod_targets
+
embedded_target
.
pod_targets
.
select
do
|
pod_target
|
aggregate_target
.
pod_targets
=
aggregate_target
.
pod_targets
+
embedded_
aggregate_
target
.
pod_targets
.
select
do
|
pod_target
|
!
pod_target_names
.
include?
pod_target
.
name
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