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
0a93634a
Unverified
Commit
0a93634a
authored
Apr 16, 2018
by
Samuel Giddins
Committed by
GitHub
Apr 16, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7638 from dnkoutso/system_module_maps
Remove [system] declaration attribute from generated module maps
parents
56231f98
90370c23
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
CHANGELOG.md
CHANGELOG.md
+4
-0
module_map.rb
lib/cocoapods/generator/module_map.rb
+1
-4
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
module_map_spec.rb
spec/unit/generator/module_map_spec.rb
+1
-1
No files found.
CHANGELOG.md
View file @
0a93634a
...
@@ -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`
##### Bug Fixes
##### Bug Fixes
*
Remove
[
system
]
declaration attribute from generated module maps
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#7589
](
https://github.com/CocoaPods/CocoaPods/issues/7589
)
*
Properly namespace Info.plist names during target installation
*
Properly namespace Info.plist names during target installation
[
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
)
...
...
lib/cocoapods/generator/module_map.rb
View file @
0a93634a
...
@@ -90,12 +90,9 @@ module Pod
...
@@ -90,12 +90,9 @@ module Pod
end
end
# The suffix attributes to `module`.
# The suffix attributes to `module`.
# Ensures that library module maps are treated as `system` modules,
# supressing warnings when imported, as is done for header imports given via `-isystem`.
#
#
def
module_declaration_attributes
def
module_declaration_attributes
return
''
if
target
.
requires_frameworks?
''
' [system]'
end
end
end
end
end
end
...
...
cocoapods-integration-specs
@
482395da
Subproject commit
7687e181cfc3200ff143e5dc1c9d7a8a378befcf
Subproject commit
482395da30d5fc55872498d471f2173dc94e8331
spec/unit/generator/module_map_spec.rb
View file @
0a93634a
...
@@ -27,7 +27,7 @@ module Pod
...
@@ -27,7 +27,7 @@ module Pod
@pod_target
.
stubs
(
:requires_frameworks?
).
returns
(
false
)
@pod_target
.
stubs
(
:requires_frameworks?
).
returns
(
false
)
@gen
.
save_as
(
path
)
@gen
.
save_as
(
path
)
path
.
read
.
should
==
<<-
EOS
.
strip_heredoc
path
.
read
.
should
==
<<-
EOS
.
strip_heredoc
module BananaLib
[system]
{
module BananaLib {
umbrella header "BananaLib-umbrella.h"
umbrella header "BananaLib-umbrella.h"
export *
export *
...
...
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