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
707a0487
Commit
707a0487
authored
Sep 02, 2017
by
Paul Beusterien
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Filter out subset dependent targets from FRAMEWORK_SEARCH_PATHS
parent
951905b8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
2 deletions
+35
-2
CHANGELOG.md
CHANGELOG.md
+6
-2
xcconfig_helper.rb
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
+11
-0
xcconfig_helper_spec.rb
spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
+18
-0
No files found.
CHANGELOG.md
View file @
707a0487
...
@@ -21,8 +21,8 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -21,8 +21,8 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
#6811
](
https://github.com/CocoaPods/CocoaPods/pull/6811
)
[
#6811
](
https://github.com/CocoaPods/CocoaPods/pull/6811
)
*
Add Private Header support to static frameworks
*
Add Private Header support to static frameworks
[
paulb777
](
https://github.com/paulb777
)
[
Paul Beusterien
](
https://github.com/paulb777
)
[
#6969
](
https://github.com/CocoaPods/CocoaPods/
issues
/6969
)
[
#6969
](
https://github.com/CocoaPods/CocoaPods/
pull
/6969
)
##### Bug Fixes
##### Bug Fixes
...
@@ -42,6 +42,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -42,6 +42,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Paul Beusterien
](
https://github.com/paulb777
)
[
Paul Beusterien
](
https://github.com/paulb777
)
[
#6997
](
https://github.com/CocoaPods/CocoaPods/pull/6997
)
[
#6997
](
https://github.com/CocoaPods/CocoaPods/pull/6997
)
*
Filter out subset dependent targets from FRAMEWORK_SEARCH_PATHS
[
Paul Beusterien
](
https://github.com/paulb777
)
[
#7002
](
https://github.com/CocoaPods/CocoaPods/pull/7002
)
## 1.3.1 (2017-08-02)
## 1.3.1 (2017-08-02)
##### Enhancements
##### Enhancements
...
...
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
View file @
707a0487
...
@@ -273,6 +273,17 @@ module Pod
...
@@ -273,6 +273,17 @@ module Pod
def
self
.
settings_for_dependent_targets
(
target
,
dependent_targets
,
test_xcconfig
=
false
)
def
self
.
settings_for_dependent_targets
(
target
,
dependent_targets
,
test_xcconfig
=
false
)
dependent_targets
=
dependent_targets
.
select
(
&
:should_build?
)
dependent_targets
=
dependent_targets
.
select
(
&
:should_build?
)
# Filter out dependent targets that are subsets of another target.
subset_targets
=
[]
dependent_targets
.
combination
(
2
)
do
|
a
,
b
|
if
(
a
.
specs
-
b
.
specs
).
empty?
subset_targets
<<
a
elsif
(
b
.
specs
-
a
.
specs
).
empty?
subset_targets
<<
b
end
end
dependent_targets
-=
subset_targets
# Alias build dirs to avoid recursive definitions for pod targets and depending
# Alias build dirs to avoid recursive definitions for pod targets and depending
# on build settings which could be overwritten in the user target.
# on build settings which could be overwritten in the user target.
build_settings
=
{
build_settings
=
{
...
...
spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
View file @
707a0487
...
@@ -63,6 +63,24 @@ module Pod
...
@@ -63,6 +63,24 @@ module Pod
xcconfig
.
to_hash
[
'OTHER_LDFLAGS'
].
should
==
'-l"xml2"'
xcconfig
.
to_hash
[
'OTHER_LDFLAGS'
].
should
==
'-l"xml2"'
end
end
it
'check that subspec subsets are removed from frameworks search paths'
do
target1
=
stub
(
:specs
=>
%w(A, B)
,
:should_build?
=>
true
,
:requires_frameworks?
=>
true
,
:configuration_build_dir
=>
'AB'
,
)
target2
=
stub
(
:specs
=>
[
'B'
],
:should_build?
=>
true
,
:requires_frameworks?
=>
true
,
:configuration_build_dir
=>
'B'
,
)
dependent_targets
=
[
target1
,
target2
]
build_settings
=
@sut
.
settings_for_dependent_targets
(
nil
,
dependent_targets
)
build_settings
[
'FRAMEWORK_SEARCH_PATHS'
].
should
==
'"AB"'
end
it
'adds the frameworks of the xcconfig'
do
it
'adds the frameworks of the xcconfig'
do
xcconfig
=
Xcodeproj
::
Config
.
new
xcconfig
=
Xcodeproj
::
Config
.
new
consumer
=
stub
(
consumer
=
stub
(
...
...
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