cocoapods-packager-pro 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e94e6eb4079389cf2cf7e5d1bc30c4be72ef7ea6
-  data.tar.gz: f6d100cdeeac1c9138c95bdd017e9f180022e82f
+  metadata.gz: 3d8291133e21ad467524ec173c214a31329541e5
+  data.tar.gz: 0b4ee2f2442040f9648b59725e0c2db0ac730d54
 SHA512:
-  metadata.gz: 9a52486794f46713181f6d840ca6e887e16bc6efa12ea4676ee65e8f273f90f955957bdad9ab3b522fcaccab170470a00a17d3f842f6090ddcd8844af6b67f9c
-  data.tar.gz: c2f94551a5b8e53398b1f0ac342cb945eaa1a76834159635cf7b592ecba8a9f8237e8b6a35335c9192f6572c4c060d75d33cc9afdba9b3d900a66dcf7095600c
+  metadata.gz: 90a4c2441b65f74318c28bfb8d2f6e577a8eea2dadf77ab5fc1e83d27c6c65e924224d594bbf228f37168b00c900cfdee1c157a837e0cb98b9a79b7f126f8d0f
+  data.tar.gz: 519003969b1e8ceef0b6926fcbbdcd62e929c140fbf2557915cfba496ac69a230bf2fae32dd8082949523aa49d8c1ea4b0b93852a674a8b4117b834508c9d161

data/lib/cocoapods-packager/builder.rb

@@ -229,17 +229,33 @@ MAP
     def copy_resources
       bundles = Dir.glob("#{@static_sandbox_root}/build/*.bundle")
 
+      bundle_names = [@spec, *@spec.recursive_subspecs].flat_map do |spec|
+        consumer = spec.consumer(@platform)
+        consumer.resource_bundles.keys +
+        consumer.resources.map do |r| 
+          File.basename(r, '.bundle') if File.extname(r) == 'bundle'
+        end
+      end.compact.uniq
+
+      bundles.select! do |bundle|
+        bundle_name = File.basename(bundle, '.bundle')
+        bundle_names.include?(bundle_name)
+      end
+
+      bundle_files = bundles.join(' ')
+
       if @dynamic
         resources_path = "ios/#{@spec.name}.framework"
-        `cp -rp #{@static_sandbox_root}/build/*.bundle #{resources_path} 2>&1`
+        `cp -rp #{bundle_files} #{resources_path} 2>&1`
       else
-        `cp -rp #{@static_sandbox_root}/build/*.bundle #{@fwk.resources_path} 2>&1`
+        `cp -rp #{bundle_files} #{@fwk.resources_path} 2>&1`
         dependency_names = @static_installer.podfile.dependencies.map(&:name)
         resources = [@spec, *@spec.recursive_subspecs].flat_map do |spec|
           if (dependency_names & [spec.name, @spec.name]).any?
             expand_paths(spec.consumer(@platform).resources)
           end
         end.compact.uniq
+
         if resources.count == 0 && bundles.count == 0
           @fwk.delete_resources
           return

data/lib/cocoapods_packager.rb

@@ -1,5 +1,5 @@
 module Pod
   module Packager
-    VERSION = '1.5.3'.freeze
+    VERSION = '1.5.4'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-packager-pro
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Kyle Fuller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods