Merge pull request #5482 from CocoaPods/seg-no-dedup-frameworks

[PodTarget] Allow non-deduped targets to be frameworks

CHANGELOG.md

@@ -14,7 +14,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 ##### Bug Fixes
 
-* None.  
+* Fix installing pods with `use_frameworks` when deduplication is disabled.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#5481](https://github.com/CocoaPods/CocoaPods/issues/5481)
 
 
 ## 1.0.1 (2016-06-02)

lib/cocoapods/target/pod_target.rb

@@ -65,6 +65,7 @@ module Pod
           target.native_target = native_target
           target.archs = archs
           target.dependent_targets = dependent_targets.flat_map { |pt| pt.scoped(cache) }.select { |pt| pt.target_definitions == [target_definition] }
+          target.host_requires_frameworks = host_requires_frameworks
           cache[cache_key] = target
         end
       end

spec/unit/installer/analyzer_spec.rb

@@ -332,6 +332,37 @@ module Pod
             Pods-SampleProject/monkey-Pods-SampleProject
           ).sort
         end
+
+        it "doesn't deduplicate targets when deduplication is disabled and using frameworks" do
+          podfile = Pod::Podfile.new do
+            install! 'cocoapods', :deduplicate_targets => false
+
+            source SpecHelper.test_repo_url
+            platform :ios, '6.0'
+            project 'SampleProject/SampleProject'
+
+            use_frameworks!
+
+            pod 'BananaLib'
+
+            target 'SampleProject' do
+              target 'TestRunner' do
+                pod 'BananaLib'
+              end
+            end
+          end
+          analyzer = Pod::Installer::Analyzer.new(config.sandbox, podfile)
+          result = analyzer.analyze
+
+          result.targets.flat_map { |at| at.pod_targets.map { |pt| "#{at.name}/#{pt.name}" } }.sort.should == %w(
+            Pods-SampleProject-TestRunner/BananaLib-Pods-SampleProject-TestRunner
+            Pods-SampleProject-TestRunner/monkey-Pods-SampleProject-TestRunner
+            Pods-SampleProject/BananaLib-Pods-SampleProject
+            Pods-SampleProject/monkey-Pods-SampleProject
+          ).sort
+
+          result.targets.flat_map { |at| at.pod_targets.map(&:requires_frameworks?) }.uniq.should == [true]
+        end
       end
 
       it 'generates the integration library appropriately if the installation will not integrate' do