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
7a26c933
Unverified
Commit
7a26c933
authored
Feb 14, 2018
by
Liquidsoul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent duplicated targets to be removed from the framework search paths
parent
1c6dedd1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
xcconfig_helper.rb
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
+1
-1
xcconfig_helper_spec.rb
spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
+12
-0
No files found.
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
View file @
7a26c933
...
...
@@ -307,7 +307,7 @@ module Pod
# Filter out dependent targets that are subsets of another target.
subset_targets
=
[]
dependent_targets
.
combination
(
2
)
do
|
a
,
b
|
dependent_targets
.
uniq
.
combination
(
2
)
do
|
a
,
b
|
if
(
a
.
specs
-
b
.
specs
).
empty?
subset_targets
<<
a
elsif
(
b
.
specs
-
a
.
specs
).
empty?
...
...
spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
View file @
7a26c933
...
...
@@ -83,6 +83,18 @@ module Pod
build_settings
[
'FRAMEWORK_SEARCH_PATHS'
].
should
==
'"AB"'
end
it
'adds the frameworks search paths once if there are duplicated targets'
do
target
=
stub
(
:specs
=>
%w(A, B)
,
:should_build?
=>
true
,
:requires_frameworks?
=>
true
,
:configuration_build_dir
=>
'AB'
,
)
dependent_targets
=
[
target
,
target
]
build_settings
=
@sut
.
search_paths_for_dependent_targets
(
nil
,
dependent_targets
)
build_settings
[
'FRAMEWORK_SEARCH_PATHS'
].
should
==
'"AB"'
end
it
'adds the libraries of the xcconfig for a static framework'
do
spec
=
stub
(
'spec'
,
:test_specification?
=>
false
)
target_definition
=
stub
(
'target_definition'
,
:inheritance
=>
'search_paths'
)
...
...
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