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
adaf73e9
Commit
adaf73e9
authored
Sep 16, 2016
by
Ben Asher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove messages application special-casing
parent
6b29b235
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
26 deletions
+1
-26
analyzer.rb
lib/cocoapods/installer/analyzer.rb
+1
-5
aggregate_target.rb
lib/cocoapods/target/aggregate_target.rb
+0
-15
aggregate_target_spec.rb
spec/unit/target/aggregate_target_spec.rb
+0
-6
No files found.
lib/cocoapods/installer/analyzer.rb
View file @
adaf73e9
...
@@ -281,11 +281,7 @@ module Pod
...
@@ -281,11 +281,7 @@ module Pod
embedded_aggregate_targets
.
each
do
|
target
|
embedded_aggregate_targets
.
each
do
|
target
|
host_uuids
=
[]
host_uuids
=
[]
aggregate_target_user_projects
.
product
(
target
.
user_targets
).
each
do
|
user_project
,
user_target
|
aggregate_target_user_projects
.
product
(
target
.
user_targets
).
each
do
|
user_project
,
user_target
|
host_targets
=
user_project
.
host_targets_for_embedded_target
(
user_target
)
host_uuids
+=
user_project
.
host_targets_for_embedded_target
(
user_target
).
map
(
&
:uuid
)
host_targets
.
map
(
&
:symbol_type
).
each
do
|
product_type
|
target
.
add_host_target_product_type
(
product_type
)
end
host_uuids
+=
host_targets
.
map
(
&
:uuid
)
end
end
# For each host, keep track of its embedded target definitions
# For each host, keep track of its embedded target definitions
# to later verify each embedded target's compatiblity with its host,
# to later verify each embedded target's compatiblity with its host,
...
...
lib/cocoapods/target/aggregate_target.rb
View file @
adaf73e9
...
@@ -27,21 +27,6 @@ module Pod
...
@@ -27,21 +27,6 @@ module Pod
@search_paths_aggregate_targets
=
[]
@search_paths_aggregate_targets
=
[]
@file_accessors
=
[]
@file_accessors
=
[]
@xcconfigs
=
{}
@xcconfigs
=
{}
@host_target_types
=
Set
.
new
# Product types of the host target, if this target is embedded
end
# Adds product type to the list of product types for the host
# targets, in which this target will be embedded
#
# @param [Symbol] product_type Product type (symbol representation)
# of a host, in which this target will be embedded
#
# @note This is important for messages extensions, since a messages
# extension has its frameworks embedded in its host when
# its host is an app but not when it's a messages app
#
def
add_host_target_product_type
(
product_type
)
@host_target_types
<<
product_type
end
end
# @return [Boolean] True if the user_target's pods are
# @return [Boolean] True if the user_target's pods are
...
...
spec/unit/target/aggregate_target_spec.rb
View file @
adaf73e9
...
@@ -224,12 +224,6 @@ module Pod
...
@@ -224,12 +224,6 @@ module Pod
@target
.
requires_host_target?
.
should
==
true
@target
.
requires_host_target?
.
should
==
true
end
end
it
'does not require a host target for messages extension targets embedded in messages applications'
do
@target
.
add_host_target_product_type
(
:messages_application
)
@target
.
user_targets
.
first
.
stubs
(
:symbol_type
).
returns
(
:messages_extension
)
@target
.
requires_host_target?
.
should
==
false
end
it
'does not require a host target for watch 2 extension targets'
do
it
'does not require a host target for watch 2 extension targets'
do
@target
.
user_targets
.
first
.
stubs
(
:symbol_type
).
returns
(
:watch2_extension
)
@target
.
user_targets
.
first
.
stubs
(
:symbol_type
).
returns
(
:watch2_extension
)
@target
.
requires_host_target?
.
should
==
false
@target
.
requires_host_target?
.
should
==
false
...
...
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