Merge pull request #9483 from igor-makarov/preserve-all-paths

When preserving pod paths, preserve ALL the paths
CocoaPods · Mar 14, 2020 · e5485d5 · e5485d5
2 parents ac1846c + 344a4e4
commit e5485d5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 ##### Bug Fixes
 
+* When preserving pod paths, preserve ALL the paths  
+  [Igor Makarov](https://github.com/igor-makarov)
+  [#9483](https://github.com/CocoaPods/CocoaPods/pull/9483)
+
 * Re-implement `dSYM` copying and stripping to avoid duplicate outputs.  
   [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
   [#9185](https://github.com/CocoaPods/CocoaPods/issues/9185)  

diff --git a/lib/cocoapods/installer/xcode/pods_project_generator/file_references_installer.rb b/lib/cocoapods/installer/xcode/pods_project_generator/file_references_installer.rb
@@ -218,7 +218,8 @@ def add_file_accessors_paths_to_pods_group(file_accessor_key, group_key = nil, r
               pod_name = file_accessor.spec.name
               preserve_pod_file_structure_flag = (sandbox.local?(pod_name) || preserve_pod_file_structure) && reflect_file_system_structure
               base_path = preserve_pod_file_structure_flag ? common_path(paths) : nil
-              group = pods_project.group_for_spec(pod_name, group_key)
+              actual_group_key = preserve_pod_file_structure_flag ? nil : group_key
+              group = pods_project.group_for_spec(pod_name, actual_group_key)
               paths.each do |path|
                 pods_project.add_file_reference(path, group, preserve_pod_file_structure_flag, base_path)
               end

diff --git a/spec/cocoapods-integration-specs b/spec/cocoapods-integration-specs
diff --git a/spec/unit/installer/xcode/pods_project_generator/file_references_installer_spec.rb b/spec/unit/installer/xcode/pods_project_generator/file_references_installer_spec.rb
@@ -295,6 +295,12 @@ class PodsProjectGenerator
           end
 
           #-------------------------------------------------------------------------#
+
+          it 'preserves all the paths of the Pod' do
+            @installer = FileReferencesInstaller.new(config.sandbox, [@pod_target], @project, true)
+            @installer.install!
+            @project.group_for_spec('BananaLib').recursive_children.map(&:name).compact.should.not.include? 'Resources'
+          end
         end
       end
     end