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
ca6e9283
Commit
ca6e9283
authored
May 21, 2018
by
Dimitris Koutsogiorgas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not symlink headers that belong to test specs
parent
815f56bf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
3 deletions
+24
-3
CHANGELOG.md
CHANGELOG.md
+4
-0
file_references_installer.rb
...xcode/pods_project_generator/file_references_installer.rb
+2
-1
file_references_installer_spec.rb
.../pods_project_generator/file_references_installer_spec.rb
+18
-2
No files found.
CHANGELOG.md
View file @
ca6e9283
...
...
@@ -28,6 +28,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
chuganzy
](
https://github.com/chuganzy
)
[
#7724
](
https://github.com/CocoaPods/CocoaPods/pull/7724
)
*
Do not symlink headers that belong to test specs
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#7762
](
https://github.com/CocoaPods/CocoaPods/pull/7762
)
*
Do not build pod target if it only contains script phases
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#7746
](
https://github.com/CocoaPods/CocoaPods/issues/7746
)
...
...
lib/cocoapods/installer/xcode/pods_project_generator/file_references_installer.rb
View file @
ca6e9283
...
...
@@ -144,7 +144,8 @@ module Pod
added_build_headers
=
false
added_public_headers
=
false
pod_target
.
file_accessors
.
each
do
|
file_accessor
|
file_accessors
=
pod_target
.
file_accessors
.
reject
{
|
fa
|
fa
.
spec
.
test_specification?
}
file_accessors
.
each
do
|
file_accessor
|
# Private headers will always end up in Pods/Headers/Private/PodA/*.h
# This will allow for `""` imports to work.
header_mappings
(
headers_sandbox
,
file_accessor
,
file_accessor
.
headers
).
each
do
|
namespaced_path
,
files
|
...
...
spec/unit/installer/xcode/pods_project_generator/file_references_installer_spec.rb
View file @
ca6e9283
...
...
@@ -114,13 +114,29 @@ module Pod
)
end
it
"doesn't link public headers from vendored framework, when frameworks required"
do
Target
.
any_instance
.
stubs
(
:requires_frameworks?
).
returns
(
true
)
it
'does not link public headers from vendored framework, when frameworks required'
do
@pod_target
.
stubs
(
:requires_frameworks?
).
returns
(
true
)
@installer
.
install!
headers_root
=
config
.
sandbox
.
public_headers
.
root
framework_header
=
headers_root
+
'BananaLib/Bananalib/Bananalib.h'
framework_header
.
should
.
not
.
exist
end
it
'does not symlink headers that belong to test specs'
do
coconut_spec
=
fixture_spec
(
'coconut-lib/CoconutLib.podspec'
)
coconut_test_spec
=
coconut_spec
.
test_specs
.
first
coconut_pod_target
=
fixture_pod_target_with_specs
([
coconut_spec
,
coconut_test_spec
],
false
)
public_headers_root
=
config
.
sandbox
.
public_headers
.
root
private_headers_root
=
coconut_pod_target
.
build_headers
.
root
project
=
Project
.
new
(
config
.
sandbox
.
project_path
)
project
.
add_pod_group
(
'CoconutLib'
,
fixture
(
'coconut-lib'
))
installer
=
FileReferencesInstaller
.
new
(
config
.
sandbox
,
[
coconut_pod_target
],
project
)
installer
.
install!
(
public_headers_root
+
'CoconutLib/Coconut.h'
).
should
.
exist
(
public_headers_root
+
'CoconutLib/CoconutTestHeader.h'
).
should
.
not
.
exist
(
private_headers_root
+
'CoconutLib/Coconut.h'
).
should
.
exist
(
private_headers_root
+
'CoconutLib/CoconutTestHeader.h'
).
should
.
not
.
exist
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