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
6d8b56b0
Commit
6d8b56b0
authored
Nov 06, 2017
by
Paul Beusterien
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Static library headers should all be Project
parent
e375d31c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
2 deletions
+18
-2
CHANGELOG.md
CHANGELOG.md
+4
-0
pod_target_installer.rb
...ller/xcode/pods_project_generator/pod_target_installer.rb
+3
-1
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
pod_target_installer_spec.rb
...xcode/pods_project_generator/pod_target_installer_spec.rb
+10
-0
No files found.
CHANGELOG.md
View file @
6d8b56b0
...
@@ -43,6 +43,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -43,6 +43,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#7166
](
https://github.com/CocoaPods/CocoaPods/pull/7166
)
[
#7166
](
https://github.com/CocoaPods/CocoaPods/pull/7166
)
*
Static library headers should all be
`Project`
in Xcode header build phase
[
Paul Beusterien
](
https://github.com/paulb777
)
[
#4496
](
https://github.com/CocoaPods/CocoaPods/issues/4496
)
*
Fix archiving apps with static frameworks
*
Fix archiving apps with static frameworks
[
Paul Beusterien
](
https://github.com/paulb777
)
[
Paul Beusterien
](
https://github.com/paulb777
)
[
#7158
](
https://github.com/CocoaPods/CocoaPods/issues/7158
)
[
#7158
](
https://github.com/CocoaPods/CocoaPods/issues/7158
)
...
...
lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
View file @
6d8b56b0
...
@@ -631,7 +631,9 @@ module Pod
...
@@ -631,7 +631,9 @@ module Pod
def
add_header
(
build_file
,
public_headers
,
private_headers
,
native_target
)
def
add_header
(
build_file
,
public_headers
,
private_headers
,
native_target
)
file_ref
=
build_file
.
file_ref
file_ref
=
build_file
.
file_ref
acl
=
if
public_headers
.
include?
(
file_ref
.
real_path
)
acl
=
if
!
target
.
requires_frameworks?
# Headers are already rooted at ${PODS_ROOT}/Headers/P*/[pod]/...
'Project'
elsif
public_headers
.
include?
(
file_ref
.
real_path
)
'Public'
'Public'
elsif
private_headers
.
include?
(
file_ref
.
real_path
)
elsif
private_headers
.
include?
(
file_ref
.
real_path
)
'Private'
'Private'
...
...
cocoapods-integration-specs
@
b41bd0e2
Subproject commit
8c89eea40c9c7fe29af512bae03f63285913e47a
Subproject commit
b41bd0e2643e317b892d6ce73d7841c6624da56d
spec/unit/installer/xcode/pods_project_generator/pod_target_installer_spec.rb
View file @
6d8b56b0
...
@@ -719,6 +719,16 @@ module Pod
...
@@ -719,6 +719,16 @@ module Pod
build_phase
.
shell_script
.
should
.
include?
(
'PrivateHeaders'
)
build_phase
.
shell_script
.
should
.
include?
(
'PrivateHeaders'
)
build_phase
.
should
.
not
.
be
.
nil
build_phase
.
should
.
not
.
be
.
nil
end
end
it
'verifies that headers in build phase for static libraries are all Project headers'
do
@pod_target
.
stubs
(
:requires_frameworks?
).
returns
(
false
)
@installer
.
install!
@project
.
targets
.
first
.
headers_build_phase
.
files
.
find
do
|
hf
|
hf
.
settings
[
'ATTRIBUTES'
].
should
==
[
'Project'
]
end
end
end
end
it
"doesn't create a build phase to symlink header folders by default on OS X"
do
it
"doesn't create a build phase to symlink header folders by default on OS X"
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