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
358040db
Commit
358040db
authored
Jul 04, 2016
by
Danielle Tomlinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Installer] Print message when skipping user project integration
parent
4fdb40b0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
CHANGELOG.md
CHANGELOG.md
+3
-0
installer.rb
lib/cocoapods/installer.rb
+5
-1
installer_spec.rb
spec/unit/installer_spec.rb
+1
-0
No files found.
CHANGELOG.md
View file @
358040db
...
@@ -36,6 +36,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -36,6 +36,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Danielle Tomlinson
](
https://github.com/DanToml
)
[
Danielle Tomlinson
](
https://github.com/DanToml
)
[
#5540
](
https://github.com/CocoaPods/CocoaPods/pulls/5540
)
[
#5540
](
https://github.com/CocoaPods/CocoaPods/pulls/5540
)
*
Print message when skipping user project integration.
[
Danielle Tomlinson
](
https://github.com/dantoml
)
[
#5517
](
https://github.com/CocoaPods/CocoaPods/issues/5517
)
##### Bug Fixes
##### Bug Fixes
...
...
lib/cocoapods/installer.rb
View file @
358040db
...
@@ -114,7 +114,11 @@ module Pod
...
@@ -114,7 +114,11 @@ module Pod
verify_no_static_framework_transitive_dependencies
verify_no_static_framework_transitive_dependencies
verify_framework_usage
verify_framework_usage
generate_pods_project
generate_pods_project
integrate_user_project
if
installation_options
.
integrate_targets?
if
installation_options
.
integrate_targets?
integrate_user_project
else
UI
.
section
'Skipping User Project Integration'
end
perform_post_install_actions
perform_post_install_actions
end
end
...
...
spec/unit/installer_spec.rb
View file @
358040db
...
@@ -157,6 +157,7 @@ module Pod
...
@@ -157,6 +157,7 @@ module Pod
@installer
.
installation_options
.
integrate_targets
=
false
@installer
.
installation_options
.
integrate_targets
=
false
@installer
.
expects
(
:integrate_user_project
).
never
@installer
.
expects
(
:integrate_user_project
).
never
@installer
.
install!
@installer
.
install!
UI
.
output
.
should
.
include
'Skipping User Project Integration'
end
end
it
'prints a list of deprecated pods'
do
it
'prints a list of deprecated pods'
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