Merge pull request #7135 from paulb777/sf-swift

Fix static_framework Swift pod deps and pod access to dep vendored modules

CHANGELOG.md

@@ -34,6 +34,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
   [#7121](https://github.com/CocoaPods/CocoaPods/issues/7121)
 
+* Fix static_framework Swift pod dependencies and implement pod access to dependent vendored_framework modules  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7117](https://github.com/CocoaPods/CocoaPods/issues/7117)
+
 * Strip vendored dSYMs during embed script phase  
   [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
   [#7111](https://github.com/CocoaPods/CocoaPods/issues/7111)

lib/cocoapods/generator/xcconfig/pod_xcconfig.rb

@@ -71,6 +71,7 @@ module Pod
           XCConfigHelper.add_target_specific_settings(target, @xcconfig)
           recursive_dependent_targets = target.recursive_dependent_targets
           @xcconfig.merge! XCConfigHelper.search_paths_for_dependent_targets(target, recursive_dependent_targets, @test_xcconfig)
+          XCConfigHelper.generate_vendored_build_settings(target, recursive_dependent_targets, @xcconfig, false) if target.requires_frameworks?
           if @test_xcconfig
             test_dependent_targets = [target, *target.recursive_test_dependent_targets].uniq
             @xcconfig.merge! XCConfigHelper.search_paths_for_dependent_targets(target, test_dependent_targets - recursive_dependent_targets, @test_xcconfig)

lib/cocoapods/installer/xcode/pods_project_generator.rb

@@ -229,10 +229,11 @@ module Pod
               aggregate_target.native_target.add_dependency(pod_target.native_target)
               configure_app_extension_api_only_for_target(pod_target) if is_app_extension
 
-              unless pod_target.static_framework?
               add_dependent_targets_to_native_target(pod_target.dependent_targets,
                                                      pod_target.native_target, is_app_extension,
-                                                       pod_target.requires_frameworks?, frameworks_group)
+                                                     pod_target.requires_frameworks? && !pod_target.static_framework?,
+                                                     frameworks_group)
+              unless pod_target.static_framework?
                 add_pod_target_test_dependencies(pod_target, frameworks_group)
               end
             end

spec/unit/generator/xcconfig/pod_xcconfig_spec.rb

@@ -9,9 +9,35 @@ module Pod
             @monkey_spec = fixture_spec('monkey/monkey.podspec')
             @monkey_pod_target = fixture_pod_target(@monkey_spec)
 
+            vspec = stub(:test_specification? => false)
+            consumer = stub(
+              :pod_target_xcconfig => {},
+              :libraries => ['xml2'],
+              :frameworks => [],
+              :weak_frameworks => [],
+              :platform_name => :ios,
+            )
+            file_accessor = stub(
+              :spec => vspec,
+              :spec_consumer => consumer,
+              :vendored_static_frameworks => [config.sandbox.root + 'AAA/StaticFramework.framework'],
+              :vendored_static_libraries => [config.sandbox.root + 'BBB/StaticLibrary.a'],
+              :vendored_dynamic_frameworks => [config.sandbox.root + 'CCC/VendoredFramework.framework'],
+              :vendored_dynamic_libraries => [config.sandbox.root + 'DDD/VendoredDyld.dyld'],
+            )
+            vendored_dep_target = stub(
+              :name => 'BananaLib',
+              :sandbox => config.sandbox,
+              :should_build? => false,
+              :requires_frameworks? => true,
+              :static_framework? => false,
+              :dependent_targets => [],
+              :file_accessors => [file_accessor],
+            )
+
             @spec = fixture_spec('banana-lib/BananaLib.podspec')
             @pod_target = fixture_pod_target(@spec)
-            @pod_target.dependent_targets = [@monkey_pod_target]
+            @pod_target.dependent_targets = [@monkey_pod_target, vendored_dep_target]
             @pod_target.host_requires_frameworks = true
 
             @consumer = @pod_target.spec_consumers.first
@@ -51,11 +77,11 @@ module Pod
             @xcconfig.to_hash['OTHER_LDFLAGS'].should.include('-weak_framework "iAd"')
           end
 
-          it 'includes the vendored dynamic frameworks for dependecy pods of the specification' do
+          it 'includes the vendored dynamic frameworks for dependency pods of the specification' do
             @xcconfig.to_hash['OTHER_LDFLAGS'].should.include('-framework "dynamic-monkey"')
           end
 
-          it 'does not include vendored static frameworks for dependecy pods of the specification' do
+          it 'does not include vendored static frameworks for dependency pods of the specification' do
             @xcconfig.to_hash['OTHER_LDFLAGS'].should.not.include('-l"monkey.a"')
           end
 
@@ -75,6 +101,23 @@ module Pod
             @xcconfig.to_hash['OTHER_LDFLAGS'].split(' ').should.include('-fobjc-arc')
           end
 
+          it 'sets the framework search paths' do
+            @xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should.include('spec/fixtures/banana-lib')
+            @xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should.include('spec/fixtures/monkey')
+            @xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should.include('${PODS_ROOT}/AAA')
+            @xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should.not.include('${PODS_ROOT}/BBB')
+            @xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should.include('${PODS_ROOT}/CCC')
+            @xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should.not.include('${PODS_ROOT}/DDD')
+          end
+
+          it 'vendored frameworks dont get added to frameworks paths if use_frameworks! isnt set' do
+            @pod_target.stubs(:requires_frameworks?).returns(false)
+            @xcconfig = @generator.generate
+            @xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should.not.include('spec/fixtures/monkey')
+            @xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should.not.include('${PODS_ROOT}/AAA')
+            @xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should.not.include('${PODS_ROOT}/CCC')
+          end
+
           it 'sets the PODS_ROOT build variable' do
             @xcconfig.to_hash['PODS_ROOT'].should.not.nil?
           end

spec/unit/generator/xcconfig/xcconfig_helper_spec.rb

@@ -119,6 +119,85 @@ module Pod
             xcconfig.to_hash['OTHER_LDFLAGS'].should == '-l"xml2"'
           end
 
+          it 'checks OTHER_LD_FLAGS and FRAMEWORK_SEARCH_PATHS for a vendored dependencies to a static framework' do
+            spec = stub(:test_specification? => false)
+            target_definition = stub(:inheritance => 'search_paths')
+            consumer = stub(
+              :pod_target_xcconfig => {},
+              :libraries => ['xml2'],
+              :frameworks => [],
+              :weak_frameworks => [],
+              :platform_name => :ios,
+            )
+            file_accessor = stub(
+              :spec => spec,
+              :spec_consumer => consumer,
+              :vendored_static_frameworks => [config.sandbox.root + 'StaticFramework.framework'],
+              :vendored_static_libraries => [config.sandbox.root + 'StaticLibrary.a'],
+              :vendored_dynamic_frameworks => [config.sandbox.root + 'VendoredFramework.framework'],
+              :vendored_dynamic_libraries => [config.sandbox.root + 'VendoredDyld.dyld'],
+            )
+            dep_target = stub(
+              :name => 'BananaLib',
+              :sandbox => config.sandbox,
+              :should_build? => false,
+              :requires_frameworks? => true,
+              :static_framework? => false,
+              :dependent_targets => [],
+              :file_accessors => [file_accessor],
+            )
+            dep_targets = [dep_target]
+            target = stub(
+              :target_definition => target_definition,
+              :pod_targets => dep_targets,
+              :search_paths_aggregate_targets => [],
+              :static_framework => true,
+            )
+            xcconfig = Xcodeproj::Config.new
+            @sut.generate_vendored_build_settings(target, dep_targets, xcconfig, true)
+            xcconfig.to_hash['OTHER_LDFLAGS'].should == '-l"StaticLibrary" -l"VendoredDyld" -l"xml2" -framework "StaticFramework" -framework "VendoredFramework"'
+            xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should == '"${PODS_ROOT}/."'
+          end
+
+          it 'check that include_ld_flags being false doesnt generate OTHER_LD_FLAGS' do
+            spec = stub(:test_specification? => false)
+            target_definition = stub(:inheritance => 'search_paths')
+            consumer = stub(
+              :pod_target_xcconfig => {},
+              :libraries => ['xml2'],
+              :frameworks => [],
+              :weak_frameworks => [],
+              :platform_name => :ios,
+            )
+            file_accessor = stub(
+              :spec => spec,
+              :spec_consumer => consumer,
+              :vendored_static_frameworks => [config.sandbox.root + 'StaticFramework.framework'],
+              :vendored_static_libraries => [config.sandbox.root + 'StaticLibrary.a'],
+              :vendored_dynamic_frameworks => [config.sandbox.root + 'VendoredFramework.framework'],
+              :vendored_dynamic_libraries => [config.sandbox.root + 'VendoredDyld.dyld'],
+            )
+            dep_target = stub(
+              :name => 'BananaLib',
+              :sandbox => config.sandbox,
+              :should_build? => false,
+              :requires_frameworks? => true,
+              :static_framework? => false,
+              :dependent_targets => [],
+              :file_accessors => [file_accessor],
+            )
+            dep_targets = [dep_target]
+            target = stub(
+              :target_definition => target_definition,
+              :pod_targets => dep_targets,
+              :search_paths_aggregate_targets => [],
+            )
+            xcconfig = Xcodeproj::Config.new
+            @sut.generate_vendored_build_settings(target, dep_targets, xcconfig, false)
+            xcconfig.to_hash['OTHER_LDFLAGS'].should.nil?
+            xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should == '"${PODS_ROOT}/."'
+          end
+
           it 'makes sure setting from search_paths get propagated for static frameworks' do
             target_definition = stub(:inheritance => 'search_paths')
             consumer = stub(
@@ -434,7 +513,7 @@ module Pod
             aggregate_target = stub(:target_definition => target_definition, :pod_targets => [], :search_paths_aggregate_targets => [])
             pod_target = stub(:sandbox => config.sandbox)
             xcconfig = Xcodeproj::Config.new
-            @sut.add_static_dependency_build_settings(aggregate_target, pod_target, xcconfig, @accessor)
+            @sut.add_static_dependency_build_settings(aggregate_target, pod_target, xcconfig, @accessor, true)
             xcconfig.to_hash['LIBRARY_SEARCH_PATHS'].should == '"${PODS_ROOT}/../../spec/fixtures/banana-lib"'
             xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should == '"${PODS_ROOT}/../../spec/fixtures/banana-lib"'
             xcconfig.to_hash['OTHER_LDFLAGS'].should.be.nil
@@ -445,7 +524,7 @@ module Pod
             pod_target = stub(:name => 'BananaLib', :sandbox => config.sandbox)
             aggregate_target = stub(:target_definition => target_definition, :pod_targets => [pod_target], :search_paths_aggregate_targets => [])
             xcconfig = Xcodeproj::Config.new
-            @sut.add_static_dependency_build_settings(aggregate_target, pod_target, xcconfig, @accessor)
+            @sut.add_static_dependency_build_settings(aggregate_target, pod_target, xcconfig, @accessor, true)
             xcconfig.to_hash['LIBRARY_SEARCH_PATHS'].should == '"${PODS_ROOT}/../../spec/fixtures/banana-lib"'
             xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should == '"${PODS_ROOT}/../../spec/fixtures/banana-lib"'
             xcconfig.to_hash['OTHER_LDFLAGS'].should == '-l"Bananalib" -framework "Bananalib"'
@@ -456,7 +535,7 @@ module Pod
             aggregate_target = stub(:target_definition => target_definition)
             pod_target = stub(:sandbox => config.sandbox)
             xcconfig = Xcodeproj::Config.new
-            @sut.add_static_dependency_build_settings(aggregate_target, pod_target, xcconfig, @accessor)
+            @sut.add_static_dependency_build_settings(aggregate_target, pod_target, xcconfig, @accessor, true)
             xcconfig.to_hash['LIBRARY_SEARCH_PATHS'].should == '"${PODS_ROOT}/../../spec/fixtures/banana-lib"'
             xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should == '"${PODS_ROOT}/../../spec/fixtures/banana-lib"'
             xcconfig.to_hash['OTHER_LDFLAGS'].should == '-l"Bananalib" -framework "Bananalib"'
@@ -465,7 +544,7 @@ module Pod
           it 'should include static framework for pod targets' do
             pod_target = stub(:sandbox => config.sandbox)
             xcconfig = Xcodeproj::Config.new
-            @sut.add_static_dependency_build_settings(nil, pod_target, xcconfig, @accessor)
+            @sut.add_static_dependency_build_settings(nil, pod_target, xcconfig, @accessor, true)
             xcconfig.to_hash['LIBRARY_SEARCH_PATHS'].should == '"${PODS_ROOT}/../../spec/fixtures/banana-lib"'
             xcconfig.to_hash['FRAMEWORK_SEARCH_PATHS'].should == '"${PODS_ROOT}/../../spec/fixtures/banana-lib"'
             xcconfig.to_hash['OTHER_LDFLAGS'].should == '-l"Bananalib" -framework "Bananalib"'

spec/unit/installer/xcode/pods_project_generator_spec.rb

@@ -298,6 +298,26 @@ module Pod
               @generator.send(:set_target_dependencies)
             end
 
+            it 'adds all test dependent targets to test native targets for static frameworks' do
+              mock_native_target = mock('CoconutLib')
+              dependent_native_target = mock('DependentNativeTarget')
+
+              dependent_target = mock('dependent-target')
+              dependent_target.stubs(:should_build?).returns(true)
+              dependent_target.stubs(:native_target).returns(dependent_native_target)
+
+              @pod_target.stubs(:native_target).returns(mock_native_target)
+              @pod_target.stubs(:dependent_targets).returns([dependent_target])
+              @pod_target.stubs(:should_build? => true)
+              @pod_target.stubs(:static_framework? => true)
+              @mock_target.expects(:add_dependency).with(mock_native_target)
+
+              mock_native_target.expects(:add_dependency).with(dependent_native_target)
+              mock_native_target.expects(:add_dependency).with(mock_native_target).never
+
+              @generator.send(:set_target_dependencies)
+            end
+
             it 'adds dependencies to pod targets that are not part of any aggregate target' do
               @target.stubs(:pod_targets).returns([])
               @generator.expects(:pod_targets).returns([@pod_target])