cocoapods-ppbuild 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 177f5365623719afc81ba079dcdfee6b910d37c2ef6bec3cb9e3ed7ca06f5efa
-  data.tar.gz: 51832c007c5bcdd40fcb1243aae611c5fc36067793f3956f961be62c5fab7c40
+  metadata.gz: 53dd9ab48b9084264f5f7251529922c6f338d556634bd765e9e6bdb39ee79b34
+  data.tar.gz: 398d6bae393855400ba28dcae5a0db71cbd9b5676a1c43ef423a79934d3e772d
 SHA512:
-  metadata.gz: 746936e683627c9a4518cb63ee101c049aea83364054d1e8df39b155e754fd42f0aa1831a10724e6c4f6ecdb15b35406b7dab66aa71efec7c6b5f3ab60be81b1
-  data.tar.gz: d343d195804b2c435e6b409d4df14e69ec581e05cff39c5046f0202abb9dc5defc32741c17b4e91d0825d211a516ba34de5e87d49c01fbbc82537595e1c314c8
+  metadata.gz: d2358845e6481c333ee5e3270fd17160b51975569bfe55220fedc66f27f8d0f3bbfa470a346a708d5ad2c2602e91f69f54d65d8b973f261a80385331e2bc3eac
+  data.tar.gz: 1c09d293fc5a76e7116e52cd0acfe7698b364c2a0c234cf5c99365aad3a56ba8a8dd0504cc49bbf8e89d592cd3bad3b9e0b410d1ba6585d58006d1171451b97f

data/lib/cocoapods-ppbuild/Integration.rb

@@ -234,13 +234,20 @@ module Pod
                 cache = []
 
                 def add_vendered_framework(spec, platform, added_framework_file_path)
-                    if spec.attributes_hash[platform] == nil
-                        spec.attributes_hash[platform] = {}
+                    platform_map = spec.attributes_hash[platform]
+                    if platform_map == nil
+                        platform_map = {}
                     end
-                    vendored_frameworks = spec.attributes_hash[platform]["vendored_frameworks"] || []
+                    vendored_frameworks = platform_map["vendored_frameworks"] || []
                     vendored_frameworks = [vendored_frameworks] if vendored_frameworks.kind_of?(String)
+                    vf = spec.attributes_hash["vendored_frameworks"] || []
+                    vf = [vf] if vf.kind_of?(String)
+                    vendored_frameworks += vf
                     vendored_frameworks += [added_framework_file_path]
-                    spec.attributes_hash[platform]["vendored_frameworks"] = vendored_frameworks
+                    spec.attributes_hash["vendored_frameworks"] = vendored_frameworks
+                    if spec.attributes_hash[platform] != nil
+                        spec.attributes_hash[platform].delete("vendored_frameworks")
+                    end
                 end
                 def empty_source_files(spec)
                     spec.attributes_hash["source_files"] = []
@@ -280,12 +287,13 @@ module Pod
                     # target after pod install. But the bundle have already built when the prebuit
                     # phase and saved in the framework folder. We will treat it as a normal resource
                     # file.
+
                     if spec.attributes_hash["resource_bundles"]
                         bundle_names = spec.attributes_hash["resource_bundles"].keys
                         spec.attributes_hash["resource_bundles"] = nil 
                         spec.attributes_hash["resources"] ||= []
                         spec.attributes_hash["resources"] += bundle_names.map{|n| n+".bundle"}
-                    elsif spec.attributes_hash['ios']["resource_bundles"]
+                    elsif spec.attributes_hash['ios'] && spec.attributes_hash['ios']["resource_bundles"]
                         bundle_names = spec.attributes_hash['ios']["resource_bundles"].keys
                         spec.attributes_hash['ios']["resource_bundles"] = nil 
                         spec.attributes_hash['ios']["resources"] ||= []

data/lib/cocoapods-ppbuild/Prebuild.rb

@@ -114,13 +114,12 @@ module Pod
             Pod::UI.puts "Prebuild frameworks (total #{targets.count})"
             Pod::Prebuild.remove_build_dir(sandbox_path)
             targets.each do |target|
+                output_path = sandbox.framework_folder_path_for_target_name(target.name)
+                output_path.rmtree if output_path.exist?
                 if !target.should_build?
                     UI.puts "Prebuilding #{target.label}"
                     next
                 end
-
-                output_path = sandbox.framework_folder_path_for_target_name(target.name)
-                output_path.rmtree if output_path.exist?
                 output_path.mkpath unless output_path.exist?
                 Pod::Prebuild.build(sandbox_path, target, output_path, bitcode_enabled,  Podfile::DSL.custom_build_options,  Podfile::DSL.custom_build_options_simulator)
 

data/lib/cocoapods-ppbuild/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPpbuild
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-ppbuild
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - 彭懂
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler