Merge pull request #7496 from marcelofabri/improve-message

Fix typo when integrating Swift pods as static libraries

CHANGELOG.md

@@ -109,6 +109,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Morgan McKenzie](https://github.com/rmtmckenzie)
   [#7463](https://github.com/CocoaPods/CocoaPods/issues/7463)
 
+* Improve messages when integrating Swift pods as static libraries.  
+  [Marcelo Fabri](https://github.com/marcelofabri)
+  [#7495](https://github.com/CocoaPods/CocoaPods/issues/7495)
+
 ## 1.4.0 (2018-01-18)
 
 ##### Enhancements

lib/cocoapods/installer/xcode/target_validator.rb

@@ -123,16 +123,16 @@ module Pod
 
             next if non_module_dependencies.empty?
 
-            error_messages << "The swift pod `#{pod_target.name}` depends upon #{non_module_dependencies.map { |d| "`#{d}`" }.to_sentence}, " \
+            error_messages << "The Swift pod `#{pod_target.name}` depends upon #{non_module_dependencies.map { |d| "`#{d}`" }.to_sentence}, " \
                               'which do not define modules. ' \
                               'To opt into those targets generating module maps '\
-                              '(which is necessary to import them from swift when building as static libraries), ' \
-                              'you may set `use_modular_header!` globally in your Podfile, '\
+                              '(which is necessary to import them from Swift when building as static libraries), ' \
+                              'you may set `use_modular_headers!` globally in your Podfile, '\
                               'or specify `:modular_headers => true` for particular dependencies.'
           end
           return if error_messages.empty?
 
-          raise Informative, 'The following swift pods cannot yet be integrated '\
+          raise Informative, 'The following Swift pods cannot yet be integrated '\
                              "as static libraries:\n\n#{error_messages.join("\n\n")}"
         end
       end

spec/unit/installer/xcode/target_validator_spec.rb

@@ -381,9 +381,9 @@ module Pod
             @validator = TargetValidator.new([], [orangeframework_pod_target, matryoshka_pod_target])
             e = lambda { @validator.validate! }.should.raise Informative
             e.message.should.include <<-EOS.strip_heredoc.strip
-              [!] The following swift pods cannot yet be integrated as static libraries:
+              [!] The following Swift pods cannot yet be integrated as static libraries:
 
-              The swift pod `OrangeFramework` depends upon `matryoshka`, which do not define modules. To opt into those targets generating module maps (which is necessary to import them from swift when building as static libraries), you may set `use_modular_header!` globally in your Podfile, or specify `:modular_headers => true` for particular dependencies.
+              The Swift pod `OrangeFramework` depends upon `matryoshka`, which do not define modules. To opt into those targets generating module maps (which is necessary to import them from Swift when building as static libraries), you may set `use_modular_headers!` globally in your Podfile, or specify `:modular_headers => true` for particular dependencies.
             EOS
           end