[Project] Store Pods products inside their group

Gemfile.lock

@@ -17,7 +17,7 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Xcodeproj.git
-  revision: f877729c796fbf275f100d44ab7eb75d9b52c330
+  revision: b0c1ee45e5922be4e5a71305bd2c5f8a4ce9f575
   branch: paths-refactor
   specs:
     xcodeproj (0.9.0)

lib/cocoapods/installer.rb

@@ -376,7 +376,7 @@ module Pod
         native_target = pods_project.targets.select { |t| t.name == aggregate_target.name }.first
         products = pods_project.products_group
         aggregate_target.pod_targets.each do |pod_target|
-          product = products.files.select { |f| f.path == pod_target.product_name }.first
+          product = pod_target.target.product_reference
           native_target.frameworks_build_phase.add_file_reference(product)
         end
       end

lib/cocoapods/installer/target_installer/pod_target_installer.rb

@@ -13,6 +13,7 @@ module Pod
       def install!
         UI.message "- Installing target `#{library.name}` #{library.platform}" do
           add_target
+          move_target_product_file_reference
           add_files_to_build_phases
           add_resources_bundle_targets
           # create_suport_files_group
@@ -50,6 +51,12 @@ module Pod
         end
       end
 
+      def move_target_product_file_reference
+        pod_name = library.pod_name
+        group = project.group_for_spec(pod_name, :products)
+        target.product_reference.move(group)
+      end
+
       # Adds the resources of the Pods to the Pods project.
       #
       # @note   The source files are grouped by Pod and in turn by subspec
@@ -62,7 +69,7 @@ module Pod
           library.file_accessors.each do |file_accessor|
             file_accessor.resource_bundles.each do |bundle_name, paths|
               file_references = paths.map { |sf| project.reference_for_path(sf) }
-              group = project.group_for_spec(file_accessor.spec.name, :resources)
+              group = project.group_for_spec(file_accessor.spec.name, :products)
               product_group = project.group_for_spec(file_accessor.spec.name, :resources)
               bundle_target = project.new_resources_bundle(bundle_name, file_accessor.spec_consumer.platform_name, product_group)
               bundle_target.add_resources(file_references)
@@ -189,7 +196,6 @@ module Pod
       def add_file_to_support_group(path)
         pod_name = library.pod_name
         group = project.group_for_spec(pod_name, :support_files)
-        group.hierarchy_path
         group.new_file(path)
       end
 

cocoapods-integration-specs @ 67647ced

-Subproject commit 3c332e5b09ae00b1ddf42994fe9d8b3d22bdd652
+Subproject commit 67647cedb7de5847e4f4fbd8d0ffbc0de4a07471

spec/unit/installer_spec.rb

@@ -397,12 +397,14 @@ module Pod
         project = Xcodeproj::Project.new('path')
         pods_target = project.new_target(:static_library, target.name, :ios)
         native_target = project.new_target(:static_library, pod_target.name, :ios)
+        pod_target.target = pods_target
+
         @installer.stubs(:pods_project).returns(project)
         @installer.stubs(:aggregate_targets).returns([target])
         @installer.stubs(:pod_targets).returns([pod_target])
 
         @installer.send(:link_aggregate_target)
-        pods_target.frameworks_build_phase.files.map(&:display_name).should.include?(pod_target.product_name)
+        pods_target.frameworks_build_phase.files.map(&:file_ref).should.include?(pod_target.target.product_reference)
       end
 
       it "integrates the client projects" do