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
3134de24
Commit
3134de24
authored
Apr 11, 2018
by
Paul Beusterien
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Always generate FRAMEWORK_SEARCH_PATHS for vendored_frameworks
parent
66373327
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
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
+5
-5
No files found.
CHANGELOG.md
View file @
3134de24
...
@@ -20,6 +20,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -20,6 +20,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#7611
](
https://github.com/CocoaPods/CocoaPods/pull/7611
)
[
#7611
](
https://github.com/CocoaPods/CocoaPods/pull/7611
)
*
Always generate FRAMEWORK_SEARCH_PATHS for vendored_frameworks.
[
Paul Beusterien
](
https://github.com/paulb777
)
[
#7591
](
https://github.com/CocoaPods/CocoaPods/issues/7591
)
*
Fix modular header access to header_dir's.
*
Fix modular header access to header_dir's.
[
Paul Beusterien
](
https://github.com/paulb777
)
[
Paul Beusterien
](
https://github.com/paulb777
)
[
#7597
](
https://github.com/CocoaPods/CocoaPods/issues/7597
)
[
#7597
](
https://github.com/CocoaPods/CocoaPods/issues/7597
)
...
...
lib/cocoapods/generator/xcconfig/pod_xcconfig.rb
View file @
3134de24
...
@@ -72,7 +72,7 @@ module Pod
...
@@ -72,7 +72,7 @@ module Pod
XCConfigHelper
.
add_target_specific_settings
(
target
,
xcconfig
)
XCConfigHelper
.
add_target_specific_settings
(
target
,
xcconfig
)
recursive_dependent_targets
=
target
.
recursive_dependent_targets
recursive_dependent_targets
=
target
.
recursive_dependent_targets
xcconfig
.
merge!
XCConfigHelper
.
search_paths_for_dependent_targets
(
target
,
recursive_dependent_targets
,
test_xcconfig?
)
xcconfig
.
merge!
XCConfigHelper
.
search_paths_for_dependent_targets
(
target
,
recursive_dependent_targets
,
test_xcconfig?
)
XCConfigHelper
.
generate_vendored_build_settings
(
target
,
recursive_dependent_targets
,
xcconfig
,
false
,
test_xcconfig?
)
if
target
.
requires_frameworks?
XCConfigHelper
.
generate_vendored_build_settings
(
target
,
recursive_dependent_targets
,
xcconfig
,
false
,
test_xcconfig?
)
if
test_xcconfig?
if
test_xcconfig?
test_dependent_targets
=
[
target
,
*
target
.
recursive_test_dependent_targets
].
uniq
test_dependent_targets
=
[
target
,
*
target
.
recursive_test_dependent_targets
].
uniq
xcconfig
.
merge!
XCConfigHelper
.
search_paths_for_dependent_targets
(
target
,
test_dependent_targets
-
recursive_dependent_targets
,
test_xcconfig?
)
xcconfig
.
merge!
XCConfigHelper
.
search_paths_for_dependent_targets
(
target
,
test_dependent_targets
-
recursive_dependent_targets
,
test_xcconfig?
)
...
...
spec/unit/generator/xcconfig/pod_xcconfig_spec.rb
View file @
3134de24
...
@@ -114,12 +114,12 @@ module Pod
...
@@ -114,12 +114,12 @@ module Pod
@xcconfig
.
to_hash
[
'FRAMEWORK_SEARCH_PATHS'
].
should
.
not
.
include
(
'${PODS_ROOT}/DDD'
)
@xcconfig
.
to_hash
[
'FRAMEWORK_SEARCH_PATHS'
].
should
.
not
.
include
(
'${PODS_ROOT}/DDD'
)
end
end
it
'vendored frameworks
dont get
added to frameworks paths if use_frameworks! isnt set'
do
it
'vendored frameworks
should be
added to frameworks paths if use_frameworks! isnt set'
do
@pod_target
.
stubs
(
:requires_frameworks?
).
returns
(
false
)
@pod_target
.
stubs
(
:requires_frameworks?
).
returns
(
false
)
@xcconfig
=
@generator
.
generate
@xcconfig
=
@generator
.
generate
@xcconfig
.
to_hash
[
'FRAMEWORK_SEARCH_PATHS'
].
should
.
not
.
include
(
'spec/fixtures/monkey'
)
@xcconfig
.
to_hash
[
'FRAMEWORK_SEARCH_PATHS'
].
should
.
include
(
'spec/fixtures/monkey'
)
@xcconfig
.
to_hash
[
'FRAMEWORK_SEARCH_PATHS'
].
should
.
not
.
include
(
'${PODS_ROOT}/AAA'
)
@xcconfig
.
to_hash
[
'FRAMEWORK_SEARCH_PATHS'
].
should
.
include
(
'${PODS_ROOT}/AAA'
)
@xcconfig
.
to_hash
[
'FRAMEWORK_SEARCH_PATHS'
].
should
.
not
.
include
(
'${PODS_ROOT}/CCC'
)
@xcconfig
.
to_hash
[
'FRAMEWORK_SEARCH_PATHS'
].
should
.
include
(
'${PODS_ROOT}/CCC'
)
end
end
it
'sets the PODS_ROOT build variable'
do
it
'sets the PODS_ROOT build variable'
do
...
@@ -255,7 +255,7 @@ module Pod
...
@@ -255,7 +255,7 @@ module Pod
generator
=
PodXCConfig
.
new
(
@coconut_pod_target
,
true
)
generator
=
PodXCConfig
.
new
(
@coconut_pod_target
,
true
)
xcconfig
=
generator
.
generate
xcconfig
=
generator
.
generate
xcconfig
.
to_hash
[
'FRAMEWORK_SEARCH_PATHS'
].
should
==
'$(inherited) "${PODS_ROOT}/../../spec/fixtures/banana-lib"'
xcconfig
.
to_hash
[
'FRAMEWORK_SEARCH_PATHS'
].
should
==
'$(inherited) "${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-l
ib"'
xcconfig
.
to_hash
[
'LIBRARY_SEARCH_PATHS'
].
should
==
'$(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/BananaLib" "${PODS_
ROOT}/../../spec/fixtures/banana-lib" "${PODS_CONFIGURATION_BUILD_DIR}/CoconutL
ib"'
end
end
it
'adds correct header search paths for dependent and test targets without modular headers'
do
it
'adds correct header search paths for dependent and test targets without modular headers'
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