Ensure that the header search paths include the public headers in the sandbox,…

Ensure that the header search paths include the public headers in the sandbox, if there are any pods that are statically compiled into the user target, when integrating Pods as frameworks.

CHANGELOG.md

@@ -17,6 +17,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   least one of them fails linting.  
   [#3869](https://github.com/CocoaPods/CocoaPods/issues/3869)
   [Samuel Giddins](https://github.com/segiddins)
+* Set header search paths properly on the user target when `vendored_libraries`
+  Pods are used while integrating Pods as frameworks.
+  [#3857](https://github.com/CocoaPods/CocoaPods/issues/3857)
+  [Jonathan MacMillan](https://github.com/perotinus)
 
 * Only link public headers in the sandbox for Pods that are not being built
   into dynamic frameworks, when integrating Pods as frameworks

lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb

@@ -93,8 +93,7 @@ module Pod
         #
         def generate_settings_to_import_pod_targets
           if target.requires_frameworks?
-            # Framework headers are automatically discoverable by `#import <…>`.
-            header_search_paths = pod_targets.map do |target|
+            framework_header_search_paths = pod_targets.select(&:should_build?).map do |target|
               if target.scoped?
                 "$PODS_FRAMEWORK_BUILD_PATH/#{target.product_name}/Headers"
               else
@@ -103,9 +102,15 @@ module Pod
             end
             build_settings = {
               'PODS_FRAMEWORK_BUILD_PATH' => target.scoped_configuration_build_dir,
-              # Make headers discoverable by `import "…"`
-              'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths, '-iquote'),
+              # Make framework headers discoverable by `import "…"`
+              'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(framework_header_search_paths, '-iquote'),
             }
+            if pod_targets.any? { |t| !t.should_build? }
+              # Make library headers discoverale by `#import "…"`
+              library_header_search_paths = target.sandbox.public_headers.search_paths(target.platform)
+              build_settings['HEADER_SEARCH_PATHS'] = XCConfigHelper.quote(library_header_search_paths)
+              build_settings['OTHER_CFLAGS'] += XCConfigHelper.quote(library_header_search_paths, '-isystem')
+            end
             if pod_targets.any? { |t| t.should_build? && t.scoped? }
               build_settings['FRAMEWORK_SEARCH_PATHS'] = '$(inherited) "$PODS_FRAMEWORK_BUILD_PATH"'
             end

spec/unit/generator/xcconfig/aggregate_xcconfig_spec.rb

@@ -157,6 +157,21 @@ module Pod
             it 'configures the project to load all members that implement Objective-c classes or categories' do
               @xcconfig.to_hash['OTHER_LDFLAGS'].should.include '-ObjC'
             end
+
+            it 'does not include framework header paths as local headers for pods that are linked statically' do
+              monkey_headers = '-iquote "$CONFIGURATION_BUILD_DIR/monkey.framework/Headers"'
+              @xcconfig.to_hash['OTHER_CFLAGS'].should.not.include monkey_headers
+            end
+
+            it 'includes the public header paths as system headers' do
+              expected = '-isystem "${PODS_ROOT}/Headers/Public"'
+              @xcconfig.to_hash['OTHER_CFLAGS'].should.include expected
+            end
+
+            it 'includes the public header paths as user headers' do
+              expected = '${PODS_ROOT}/Headers/Public'
+              @xcconfig.to_hash['HEADER_SEARCH_PATHS'].should.include expected
+            end
           end
 
           it 'sets the PODS_FRAMEWORK_BUILD_PATH build variable' do