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
36151737
Unverified
Commit
36151737
authored
Mar 26, 2018
by
Dimitris Koutsogiorgas
Committed by
Samuel Giddins
May 07, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Escape double quotes for module map contents
parent
6dcb1af1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
4 deletions
+23
-4
CHANGELOG.md
CHANGELOG.md
+4
-1
module_map.rb
lib/cocoapods/generator/module_map.rb
+3
-3
module_map_spec.rb
spec/unit/generator/module_map_spec.rb
+16
-0
No files found.
CHANGELOG.md
View file @
36151737
...
...
@@ -12,10 +12,13 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes
*
Escape double quotes for module map contents
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#7549
](
https://github.com/CocoaPods/CocoaPods/pull/7549
)
*
Fix building Swift static library test specs.
[
Samuel Giddins
](
https://github.com/segiddins
)
## 1.5.0.beta.1 (2018-03-23)
##### Enhancements
...
...
lib/cocoapods/generator/module_map.rb
View file @
36151737
...
...
@@ -6,7 +6,7 @@ module Pod
# with existing headers of the podspec.
#
class
ModuleMap
# @return [PodTarget
] the target represented by this Info.plist
.
# @return [PodTarget
, AggregateTarget] the target the module map is generated for
.
#
attr_reader
:target
...
...
@@ -21,7 +21,7 @@ module Pod
(
:umbrella
if
umbrella
),
(
:exclude
if
exclude
),
'header'
,
%("#{path}")
,
%("#{path
.to_s.gsub('"', '\"')
}")
,
attrs
,
].
compact
.
join
(
' '
)
end
...
...
@@ -38,7 +38,7 @@ module Pod
# Initialize a new instance
#
# @param [PodTarget] target @see target
# @param [PodTarget
, AggregateTarget
] target @see target
#
def
initialize
(
target
)
@target
=
target
...
...
spec/unit/generator/module_map_spec.rb
View file @
36151737
...
...
@@ -35,5 +35,21 @@ module Pod
}
EOS
end
it
'escapes double quotes properly for module map contents'
do
path
=
temporary_directory
+
'BananaLib.modulemap'
@pod_target
.
stubs
(
:umbrella_header_path
).
returns
(
Pathname
.
new
(
'BananaLibWith"Quotes"-umbrella.h'
))
@pod_target
.
stubs
(
:requires_frameworks?
).
returns
(
true
)
gen
=
Generator
::
ModuleMap
.
new
(
@pod_target
)
gen
.
save_as
(
path
)
path
.
read
.
should
==
<<-
EOS
.
strip_heredoc
framework module BananaLib {
umbrella header "BananaLibWith
\\
"Quotes
\\
"-umbrella.h"
export *
module * { export * }
}
EOS
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