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
03c1ad44
Commit
03c1ad44
authored
Feb 20, 2018
by
Samuel Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add an integration spec that Integrates a pod with static swift libraries and objective c modules
parent
4acf59d4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
pod_target_installer.rb
...ller/xcode/pods_project_generator/pod_target_installer.rb
+1
-1
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
integration.rb
spec/integration.rb
+5
-0
pod_xcconfig_spec.rb
spec/unit/generator/xcconfig/pod_xcconfig_spec.rb
+1
-1
No files found.
lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
View file @
03c1ad44
...
@@ -622,7 +622,7 @@ module Pod
...
@@ -622,7 +622,7 @@ module Pod
UI
.
message
"- Copying module map file to
#{
UI
.
path
(
path
)
}
"
do
UI
.
message
"- Copying module map file to
#{
UI
.
path
(
path
)
}
"
do
contents
=
custom_module_map
.
read
contents
=
custom_module_map
.
read
unless
target
.
requires_frameworks?
unless
target
.
requires_frameworks?
contents
.
gsub!
(
/^(\s*)framework\s+(module
[^{}]){/
,
'\1\2
[system] {'
)
contents
.
gsub!
(
/^(\s*)framework\s+(module
[^{}]+){/
,
'\1\2
[system] {'
)
end
end
generator
=
Generator
::
Constant
.
new
(
contents
)
generator
=
Generator
::
Constant
.
new
(
contents
)
update_changed_file
(
generator
,
path
)
update_changed_file
(
generator
,
path
)
...
...
cocoapods-integration-specs
@
ce9fcea6
Subproject commit
b21c05141a790ac307a0ff605d2015e58c17388
9
Subproject commit
ce9fcea6cbeb3d1f2cdc000c204569182cce92b
9
spec/integration.rb
View file @
03c1ad44
...
@@ -313,6 +313,11 @@ describe_cli 'pod' do
...
@@ -313,6 +313,11 @@ describe_cli 'pod' do
'install --no-repo-update'
'install --no-repo-update'
end
end
describe
'Integrates a pod with static swift libraries and objective c modules'
do
behaves_like
cli_spec
'install_static_swift_modules'
,
'install --no-repo-update'
end
describe
'Integrates a Pod with circular subspec dependencies'
do
describe
'Integrates a Pod with circular subspec dependencies'
do
behaves_like
cli_spec
'install_circular_subspec_dependency'
,
behaves_like
cli_spec
'install_circular_subspec_dependency'
,
'install --no-repo-update'
'install --no-repo-update'
...
...
spec/unit/generator/xcconfig/pod_xcconfig_spec.rb
View file @
03c1ad44
...
@@ -138,7 +138,7 @@ module Pod
...
@@ -138,7 +138,7 @@ module Pod
end
end
it
'does not add root public or private header search paths to the xcconfig'
do
it
'does not add root public or private header search paths to the xcconfig'
do
@xcconfig
.
to_hash
[
'HEADER_SEARCH_PATHS'
].
should
.
be
.
empty
@xcconfig
.
to_hash
[
'HEADER_SEARCH_PATHS'
].
should
.
be
.
nil
end
end
it
'adds the COCOAPODS macro definition'
do
it
'adds the COCOAPODS macro definition'
do
...
...
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