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
0873065d
Commit
0873065d
authored
Mar 31, 2014
by
Luis de la Rosa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issue #1449 by collecting the prefix_header_contents and uniq-ing them.
parent
eb6ebeb7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
2 deletions
+14
-2
prefix_header.rb
lib/cocoapods/generator/prefix_header.rb
+14
-2
No files found.
lib/cocoapods/generator/prefix_header.rb
View file @
0873065d
...
@@ -53,12 +53,24 @@ module Pod
...
@@ -53,12 +53,24 @@ module Pod
result
<<
%|\n#import "#{import}"|
result
<<
%|\n#import "#{import}"|
end
end
file_accessors
.
each
do
|
file_accessor
|
# collect all the prefix_header_contents and only get the unique contents so that we don't have duplicates
all_prefix_header_contents
=
file_accessors
.
collect
do
|
file_accessor
|
file_accessor
.
spec_consumer
.
prefix_header_contents
end
unique_and_non_nil_prefix_header_contents
=
all_prefix_header_contents
.
compact
.
uniq
# newline to separate prefix_headers and prefix_header_contents from the imports
result
<<
"
\n
"
result
<<
"
\n
"
if
prefix_header_contents
=
file_accessor
.
spec_consumer
.
prefix_header_contents
# output those unique prefix_header_contents
unique_and_non_nil_prefix_header_contents
.
each
do
|
prefix_header_contents
|
result
<<
prefix_header_contents
result
<<
prefix_header_contents
result
<<
"
\n
"
result
<<
"
\n
"
end
end
# output the prefix_headers
# todo check to see if we have a similar duplicating issue with these
file_accessors
.
each
do
|
file_accessor
|
if
prefix_header
=
file_accessor
.
prefix_header
if
prefix_header
=
file_accessor
.
prefix_header
result
<<
Pathname
(
prefix_header
).
read
result
<<
Pathname
(
prefix_header
).
read
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