Commit 8852ded3 authored by Samuel Giddins's avatar Samuel Giddins Committed by GitHub

Merge pull request #5593 from DanToml/dan_install_nointegrate_message

[Installer] Print message when skipping user project integration
parents 791a51f2 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
......
...@@ -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
......
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment