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
35bfd3ce
Unverified
Commit
35bfd3ce
authored
May 06, 2016
by
Samuel Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PodXCConfig] Use recursive dependent targets
parent
4c4b69bd
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
2 deletions
+16
-2
pod_xcconfig.rb
lib/cocoapods/generator/xcconfig/pod_xcconfig.rb
+1
-1
pod_target.rb
lib/cocoapods/target/pod_target.rb
+9
-0
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
integration.rb
spec/integration.rb
+5
-0
No files found.
lib/cocoapods/generator/xcconfig/pod_xcconfig.rb
View file @
35bfd3ce
...
@@ -63,7 +63,7 @@ module Pod
...
@@ -63,7 +63,7 @@ module Pod
@xcconfig
.
merge!
(
file_accessor
.
spec_consumer
.
pod_target_xcconfig
)
@xcconfig
.
merge!
(
file_accessor
.
spec_consumer
.
pod_target_xcconfig
)
end
end
XCConfigHelper
.
add_target_specific_settings
(
target
,
@xcconfig
)
XCConfigHelper
.
add_target_specific_settings
(
target
,
@xcconfig
)
@xcconfig
.
merge!
XCConfigHelper
.
settings_for_dependent_targets
(
target
,
target
.
dependent_targets
)
@xcconfig
.
merge!
XCConfigHelper
.
settings_for_dependent_targets
(
target
,
target
.
recursive_
dependent_targets
)
@xcconfig
@xcconfig
end
end
...
...
lib/cocoapods/target/pod_target.rb
View file @
35bfd3ce
...
@@ -184,6 +184,15 @@ module Pod
...
@@ -184,6 +184,15 @@ module Pod
end
.
uniq
end
.
uniq
end
end
# @return [Array<PodTarget>] the recursive targets that this target has a
# dependency upon.
#
def
recursive_dependent_targets
targets
=
dependent_targets
+
dependent_targets
.
flat_map
(
&
:dependent_targets
)
targets
.
uniq!
targets
end
# Checks if the target should be included in the build configuration with
# Checks if the target should be included in the build configuration with
# the given name of a given target definition.
# the given name of a given target definition.
#
#
...
...
cocoapods-integration-specs
@
4560c5c5
Subproject commit
ccf9b780f7d7f28395ec15bad15b8e3eee800d47
Subproject commit
4560c5c5bbc2fe7d6efe055b41b5fae622640826
spec/integration.rb
View file @
35bfd3ce
...
@@ -286,6 +286,11 @@ describe_cli 'pod' do
...
@@ -286,6 +286,11 @@ describe_cli 'pod' do
behaves_like
cli_spec
'install_using_checkout_options'
,
behaves_like
cli_spec
'install_using_checkout_options'
,
'install --no-repo-update'
'install --no-repo-update'
end
end
describe
'Integrates a pod with search paths inheritance'
do
behaves_like
cli_spec
'install_search_paths_inheritance'
,
'install --no-repo-update'
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