Merge pull request #7068 from dnkoutso/fix_caching

Fix framework and resources paths caching

CHANGELOG.md

@@ -14,6 +14,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 ##### Bug Fixes
 
+* Fix framework and resources paths caching  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7068](https://github.com/CocoaPods/CocoaPods/pull/7068)
+
 * Build subspecs in static frameworks without error  
   [Paul Beusterien](https://github.com/paulb777)
   [#7058](https://github.com/CocoaPods/CocoaPods/pull/7058)

lib/cocoapods/target/pod_target.rb

@@ -207,36 +207,35 @@ module Pod
     #         this target depends upon.
     #
     def framework_paths(include_test_spec_paths = true)
-      @framework_paths ||= Hash.new do |h, key|
-        h[key] = begin
-          accessors = file_accessors
-          accessors = accessors.reject { |a| a.spec.test_specification? } unless include_test_spec_paths
-          frameworks = []
-          accessors.flat_map(&:vendored_dynamic_artifacts).map do |framework_path|
-            relative_path_to_sandbox = framework_path.relative_path_from(sandbox.root)
-            framework = { :name => framework_path.basename.to_s,
-                          :input_path => "${PODS_ROOT}/#{relative_path_to_sandbox}",
-                          :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{framework_path.basename}" }
-            # Until this can be configured, assume the dSYM file uses the file name as the framework.
-            # See https://github.com/CocoaPods/CocoaPods/issues/1698
-            dsym_name = "#{framework_path.basename}.dSYM"
-            dsym_path = Pathname.new("#{framework_path.dirname}/#{dsym_name}")
-            if dsym_path.exist?
-              framework[:dsym_name] = dsym_name
-              framework[:dsym_input_path] = "${PODS_ROOT}/#{relative_path_to_sandbox}.dSYM"
-              framework[:dsym_output_path] = "${DWARF_DSYM_FOLDER_PATH}/#{dsym_name}"
-            end
-            frameworks << framework
+      @framework_paths ||= {}
+      return @framework_paths[include_test_spec_paths] if @framework_paths.key?(include_test_spec_paths)
+      @framework_paths[include_test_spec_paths] = begin
+        accessors = file_accessors
+        accessors = accessors.reject { |a| a.spec.test_specification? } unless include_test_spec_paths
+        frameworks = []
+        accessors.flat_map(&:vendored_dynamic_artifacts).map do |framework_path|
+          relative_path_to_sandbox = framework_path.relative_path_from(sandbox.root)
+          framework = { :name => framework_path.basename.to_s,
+                        :input_path => "${PODS_ROOT}/#{relative_path_to_sandbox}",
+                        :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{framework_path.basename}" }
+          # Until this can be configured, assume the dSYM file uses the file name as the framework.
+          # See https://github.com/CocoaPods/CocoaPods/issues/1698
+          dsym_name = "#{framework_path.basename}.dSYM"
+          dsym_path = Pathname.new("#{framework_path.dirname}/#{dsym_name}")
+          if dsym_path.exist?
+            framework[:dsym_name] = dsym_name
+            framework[:dsym_input_path] = "${PODS_ROOT}/#{relative_path_to_sandbox}.dSYM"
+            framework[:dsym_output_path] = "${DWARF_DSYM_FOLDER_PATH}/#{dsym_name}"
           end
-          if should_build? && requires_frameworks? && !static_framework?
-            frameworks << { :name => product_name,
-                            :input_path => build_product_path('${BUILT_PRODUCTS_DIR}'),
-                            :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{product_name}" }
-          end
-          frameworks
+          frameworks << framework
+        end
+        if should_build? && requires_frameworks? && !static_framework?
+          frameworks << { :name => product_name,
+                          :input_path => build_product_path('${BUILT_PRODUCTS_DIR}'),
+                          :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{product_name}" }
         end
+        frameworks
       end
-      @framework_paths[include_test_spec_paths]
     end
 
     # Returns the resource paths associated with this target. By default all paths include the resource paths
@@ -248,22 +247,21 @@ module Pod
     # @return [Array<String>] The resource and resource bundle paths this target depends upon.
     #
     def resource_paths(include_test_spec_paths = true)
-      @resource_paths ||= Hash.new do |h, key|
-        h[key] = begin
-          accessors = file_accessors
-          accessors = accessors.reject { |a| a.spec.test_specification? } unless include_test_spec_paths
-          resource_paths = accessors.flat_map do |accessor|
-            accessor.resources.flat_map { |res| "${PODS_ROOT}/#{res.relative_path_from(sandbox.project.path.dirname)}" }
-          end
-          resource_bundles = accessors.flat_map do |accessor|
-            prefix = Generator::XCConfig::XCConfigHelper::CONFIGURATION_BUILD_DIR_VARIABLE
-            prefix = configuration_build_dir unless accessor.spec.test_specification?
-            accessor.resource_bundles.keys.map { |name| "#{prefix}/#{name.shellescape}.bundle" }
-          end
-          resource_paths + resource_bundles
+      @resource_paths ||= {}
+      return @resource_paths[include_test_spec_paths] if @resource_paths.key?(include_test_spec_paths)
+      @resource_paths[include_test_spec_paths] = begin
+        accessors = file_accessors
+        accessors = accessors.reject { |a| a.spec.test_specification? } unless include_test_spec_paths
+        resource_paths = accessors.flat_map do |accessor|
+          accessor.resources.flat_map { |res| "${PODS_ROOT}/#{res.relative_path_from(sandbox.project.path.dirname)}" }
+        end
+        resource_bundles = accessors.flat_map do |accessor|
+          prefix = Generator::XCConfig::XCConfigHelper::CONFIGURATION_BUILD_DIR_VARIABLE
+          prefix = configuration_build_dir unless accessor.spec.test_specification?
+          accessor.resource_bundles.keys.map { |name| "#{prefix}/#{name.shellescape}.bundle" }
         end
+        resource_paths + resource_bundles
       end
-      @resource_paths[include_test_spec_paths]
     end
 
     # Returns the corresponding native target to use based on the provided specification.