fix(*): duplicate resources for dynamic frameworks grab#74

Author: trinhngocthuyen

CHANGELOG.md

@@ -5,7 +5,7 @@
 NA
 
 ### Bug fixes
-NA
+- Fix duplicate resources for dynamic frameworks https://github.com/grab/cocoapods-binary-cache/issues/74.
 
 ## 0.1.14
 ### Enhancements

lib/cocoapods-binary-cache/pod-binary/helper/prebuild_sandbox.rb

@@ -3,13 +3,13 @@
 module Pod
   class PrebuildSandbox < Sandbox
     # [String] standard_sandbox_path
-    def self.from_standard_sanbox_path(path)
+    def self.from_standard_sandbox_path(path)
       prebuild_sandbox_path = Pathname.new(path).realpath + ".." + PodPrebuild.config.prebuild_sandbox_path
       new(prebuild_sandbox_path)
     end
 
     def self.from_standard_sandbox(sandbox)
-      from_standard_sanbox_path(sandbox.root)
+      from_standard_sandbox_path(sandbox.root)
     end
 
     def standard_sanbox_path

lib/cocoapods-binary-cache/pod-binary/helper/sandbox.rb

@@ -0,0 +1,9 @@
+require_relative "prebuild_sandbox"
+
+module Pod
+  class Sandbox
+    def prebuild_sandbox
+      @prebuild_sandbox ||= Pod::PrebuildSandbox.from_standard_sandbox(self)
+    end
+  end
+end

lib/cocoapods-binary-cache/pod-binary/integration.rb

@@ -1,5 +1,6 @@
 require_relative "helper/podfile_options"
 require_relative "helper/prebuild_sandbox"
+require_relative "helper/sandbox"
 require_relative "helper/names"
 require_relative "helper/target_checker"
 require_relative "integration/alter_specs"

lib/cocoapods-binary-cache/pod-binary/integration/alter_specs.rb

@@ -26,7 +26,19 @@ def alter_specs_for_prebuilt_pods
 
     private
 
+    def metadata_of_target(name)
+      @metadata_by_target ||= {}
+      metadata = @metadata_by_target[name]
+      return metadata unless metadata.nil?
+
+      framework_path = sandbox.prebuild_sandbox.framework_folder_path_for_target_name(name)
+      metadata = PodPrebuild::Metadata.in_dir(framework_path)
+      @metadata_by_target[name] = metadata
+      metadata
+    end
+
     def alter_spec(spec, alterations, cache)
+      metadata = metadata_of_target(spec.root.name)
       targets = Pod.fast_get_targets_for_pod_name(spec.root.name, pod_targets, cache)
       platforms = targets.map { |target| target.platform.name.to_s }.uniq
 
@@ -43,11 +55,31 @@ def alter_spec(spec, alterations, cache)
       end
 
       empty_source_files(spec, platforms) if alterations[:source_files]
-      tweak_resources_for_xib(spec, platforms) if alterations[:resources]
-      tweak_resources_for_resource_bundles(spec, platforms) if alterations[:resources]
+      if alterations[:resources]
+        if metadata.static_framework?
+          tweak_resources_for_xib(spec, platforms)
+          tweak_resources_for_resource_bundles(spec, platforms)
+        else
+          # For dynamic frameworks, resources & resource bundles are already bundled inside the framework.
+          # We need to empty resources & resource bundles. Otherwise, there will be duplications
+          # (resources locating in both app bundle and framework bundle)
+          empty_resources(spec, platforms)
+        end
+      end
       empty_liscence(spec) if alterations[:license]
     end
 
+    def empty_resources(spec, platforms)
+      spec.attributes_hash["resources"] = nil
+      spec.attributes_hash["resource_bundles"] = nil
+      platforms.each do |platform|
+        next if spec.attributes_hash[platform].nil?
+
+        spec.attributes_hash[platform]["resources"] = nil
+        spec.attributes_hash[platform]["resource_bundles"] = nil
+      end
+    end
+
     def tweak_resources_for_xib(spec, platforms)
       # This is a workaround for prebuilt static framework that has `*.xib` files in the resources
       # (declared by `spec.resources = ...`)