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
ac3c7dfe
Commit
ac3c7dfe
authored
Aug 23, 2017
by
Danielle Tomlinson
Committed by
GitHub
Aug 23, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6969 from paulb777/static-framework-private-headers
Add Private Header support to static frameworks
parents
61afb0d9
66f46c30
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
0 deletions
+17
-0
CHANGELOG.md
CHANGELOG.md
+4
-0
target_installer.rb
...nstaller/xcode/pods_project_generator/target_installer.rb
+1
-0
target_installer_spec.rb
...ler/xcode/pods_project_generator/target_installer_spec.rb
+12
-0
No files found.
CHANGELOG.md
View file @
ac3c7dfe
...
...
@@ -16,6 +16,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Paul Beusterien
](
https://github.com/paulb777
)
[
#6811
](
https://github.com/CocoaPods/CocoaPods/pull/6811
)
*
Add Private Header support to static frameworks
[
paulb777
](
https://github.com/paulb777
)
[
#6969
](
https://github.com/CocoaPods/CocoaPods/issues/6969
)
##### Bug Fixes
*
Wrap platform warning message with quotes
...
...
lib/cocoapods/installer/xcode/pods_project_generator/target_installer.rb
View file @
ac3c7dfe
...
...
@@ -85,6 +85,7 @@ module Pod
settings
[
'PRODUCT_NAME'
]
=
framework_name
if
target
.
static_framework?
settings
[
'PUBLIC_HEADERS_FOLDER_PATH'
]
=
framework_name
+
'.framework'
+
'/Headers'
settings
[
'PRIVATE_HEADERS_FOLDER_PATH'
]
=
framework_name
+
'.framework'
+
'/PrivateHeaders'
end
else
settings
.
merge!
(
'OTHER_LDFLAGS'
=>
''
,
'OTHER_LIBTOOLFLAGS'
=>
''
)
...
...
spec/unit/installer/xcode/pods_project_generator/target_installer_spec.rb
View file @
ac3c7dfe
...
...
@@ -72,6 +72,18 @@ module Pod
'AppStore'
=>
'BananaLib.framework/Headers'
,
}
end
it
'verify private header path for a static library framework'
do
@pod_target
.
stubs
(
:requires_frameworks?
).
returns
(
true
)
@pod_target
.
stubs
(
:static_framework?
).
returns
(
true
)
@installer
.
send
(
:add_target
)
@installer
.
send
(
:native_target
).
resolved_build_setting
(
'PRIVATE_HEADERS_FOLDER_PATH'
).
should
==
{
'Release'
=>
'BananaLib.framework/PrivateHeaders'
,
'Debug'
=>
'BananaLib.framework/PrivateHeaders'
,
'Test'
=>
'BananaLib.framework/PrivateHeaders'
,
'AppStore'
=>
'BananaLib.framework/PrivateHeaders'
,
}
end
end
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