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
22c58055
Commit
22c58055
authored
May 05, 2015
by
Samuel E. Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PodTargetInstaller] Don't generate an umbrella header when a custom module map is specified.
parent
6d631141
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
CHANGELOG.md
CHANGELOG.md
+4
-0
pod_target_installer.rb
...oapods/installer/target_installer/pod_target_installer.rb
+10
-2
No files found.
CHANGELOG.md
View file @
22c58055
...
...
@@ -37,6 +37,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Samuel Giddins
](
https://github.com/segiddins
)
[
#3502
](
https://github.com/CocoaPods/CocoaPods/issues/3502
)
*
Don't generate an umbrella header when a custom module map is specified. This
avoids an incomplete module map warning.
[
Samuel Giddins
](
https://github.com/segiddins
)
## 0.37.0
...
...
lib/cocoapods/installer/target_installer/pod_target_installer.rb
View file @
22c58055
...
...
@@ -256,10 +256,10 @@ module Pod
end
def
create_module_map
return
super
unless
module_map
=
target
.
file_accessors
.
first
.
module_map
return
super
unless
custom_
module_map
path
=
target
.
module_map_path
UI
.
message
"- Copying module map file to
#{
UI
.
path
(
path
)
}
"
do
FileUtils
.
cp
(
module_map
,
path
)
FileUtils
.
cp
(
custom_
module_map
,
path
)
add_file_to_support_group
(
path
)
native_target
.
build_configurations
.
each
do
|
c
|
...
...
@@ -269,6 +269,14 @@ module Pod
end
end
def
create_umbrella_header
return
super
unless
custom_module_map
end
def
custom_module_map
@custom_module_map
||=
target
.
file_accessors
.
first
.
module_map
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