CocoaPods Adds a Resource Bundle Scheme on Each pod install Invocation

CHANGELOG.md

@@ -6,6 +6,12 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 ###### Bug Fixes
 
+* Resource bundle targets are now namespaced with the label prefix (consisting of integration target name and the source pod name).
+  This prevents the creation of multiple targets with the same name.
+
+  [Blake Watters](https://github.com/blakewatters)
+  [#1338](https://github.com/CocoaPods/CocoaPods/issues/1338)
+
 * Solved outstanding issues with CocoaPods resource bundles and Archive builds:
   1. The rsync task copies symlinks into the App Bundle, producing an invalid app. This change add `--copy-links`
   to the rsync invocation to ensure the target files are copied rather than the symlink.

lib/cocoapods/installer/target_installer/aggregate_target_installer.rb

@@ -91,7 +91,8 @@ def create_copy_resources_script
         UI.message "- Generating copy resources script at #{UI.path(path)}" do
           file_accessors = library.pod_targets.map(&:file_accessors).flatten
           resource_paths = file_accessors.map { |accessor| accessor.resources.flatten.map { |res| res.relative_path_from(project.path.dirname) }}.flatten
-          resource_bundles = file_accessors.map { |accessor| accessor.resource_bundles.keys.map {|name| "${BUILT_PRODUCTS_DIR}/#{name}.bundle" } }.flatten
+          resource_bundles = library.pod_targets.map { |pod_target| pod_target.file_accessors.flatten.map { |accessor| accessor.resource_bundles.keys.map { |name| "${BUILT_PRODUCTS_DIR}/#{pod_target.label}-#{name}.bundle" } } }.flatten
+
           resources = []
           resources.concat(resource_paths)
           resources.concat(resource_bundles)

lib/cocoapods/installer/target_installer/pod_target_installer.rb

@@ -68,7 +68,7 @@ def add_resources_bundle_targets
               file_references = paths.map { |sf| project.reference_for_path(sf) }
               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 = project.new_resources_bundle("#{library.label}-#{bundle_name}", file_accessor.spec_consumer.platform_name, product_group)
               bundle_target.add_resources(file_references)
 
               library.user_build_configurations.each do |bc_name, type|