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
d13c4c73
Commit
d13c4c73
authored
May 25, 2017
by
Dimitris Koutsogiorgas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Settings for dependent targets should include the parent target for test xcconfigs
parent
cfa56c10
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
CHANGELOG.md
CHANGELOG.md
+4
-0
pod_xcconfig.rb
lib/cocoapods/generator/xcconfig/pod_xcconfig.rb
+1
-1
pod_xcconfig_spec.rb
spec/unit/generator/xcconfig/pod_xcconfig_spec.rb
+1
-1
No files found.
CHANGELOG.md
View file @
d13c4c73
...
@@ -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`
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#6756
](
https://github.com/CocoaPods/CocoaPods/pull/6756
)
[
#6756
](
https://github.com/CocoaPods/CocoaPods/pull/6756
)
*
Settings for dependent targets should include the parent target for test xcconfigs
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#6755
](
https://github.com/CocoaPods/CocoaPods/pull/6755
)
*
Only check for valid Swift version for pod targets that use Swift
*
Only check for valid Swift version for pod targets that use Swift
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#6733
](
https://github.com/CocoaPods/CocoaPods/pull/6733
)
[
#6733
](
https://github.com/CocoaPods/CocoaPods/pull/6733
)
...
...
lib/cocoapods/generator/xcconfig/pod_xcconfig.rb
View file @
d13c4c73
...
@@ -71,7 +71,7 @@ module Pod
...
@@ -71,7 +71,7 @@ module Pod
XCConfigHelper
.
add_target_specific_settings
(
target
,
@xcconfig
)
XCConfigHelper
.
add_target_specific_settings
(
target
,
@xcconfig
)
@xcconfig
.
merge!
XCConfigHelper
.
settings_for_dependent_targets
(
target
,
target
.
recursive_dependent_targets
)
@xcconfig
.
merge!
XCConfigHelper
.
settings_for_dependent_targets
(
target
,
target
.
recursive_dependent_targets
)
if
@test_xcconfig
if
@test_xcconfig
@xcconfig
.
merge!
XCConfigHelper
.
settings_for_dependent_targets
(
target
,
target
.
test_dependent_targets
)
@xcconfig
.
merge!
XCConfigHelper
.
settings_for_dependent_targets
(
target
,
[
target
,
*
target
.
test_dependent_targets
]
)
XCConfigHelper
.
generate_vendored_build_settings
(
nil
,
[
target
,
*
target
.
test_dependent_targets
],
@xcconfig
)
XCConfigHelper
.
generate_vendored_build_settings
(
nil
,
[
target
,
*
target
.
test_dependent_targets
],
@xcconfig
)
XCConfigHelper
.
generate_other_ld_flags
(
nil
,
[
target
,
*
target
.
test_dependent_targets
],
@xcconfig
)
XCConfigHelper
.
generate_other_ld_flags
(
nil
,
[
target
,
*
target
.
test_dependent_targets
],
@xcconfig
)
XCConfigHelper
.
generate_ld_runpath_search_paths
(
target
,
false
,
true
,
@xcconfig
)
XCConfigHelper
.
generate_ld_runpath_search_paths
(
target
,
false
,
true
,
@xcconfig
)
...
...
spec/unit/generator/xcconfig/pod_xcconfig_spec.rb
View file @
d13c4c73
...
@@ -159,7 +159,7 @@ module Pod
...
@@ -159,7 +159,7 @@ module Pod
@coconut_pod_target
.
test_dependent_targets
=
[
@banana_pod_target
]
@coconut_pod_target
.
test_dependent_targets
=
[
@banana_pod_target
]
generator
=
PodXCConfig
.
new
(
@coconut_pod_target
,
true
)
generator
=
PodXCConfig
.
new
(
@coconut_pod_target
,
true
)
xcconfig
=
generator
.
generate
xcconfig
=
generator
.
generate
xcconfig
.
to_hash
[
'LIBRARY_SEARCH_PATHS'
].
should
==
'$(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BananaLib" "${PODS_ROOT}/../../spec/fixtures/banana-lib"'
xcconfig
.
to_hash
[
'LIBRARY_SEARCH_PATHS'
].
should
==
'$(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BananaLib" "$
PODS_CONFIGURATION_BUILD_DIR/CoconutLib" "$
{PODS_ROOT}/../../spec/fixtures/banana-lib"'
end
end
it
'does not include other ld flags for test dependent targets if its not a test xcconfig'
do
it
'does not include other ld flags for test dependent targets if its not a test xcconfig'
do
...
...
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