cocoapods-ppbuild 1.0.3 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 125cd2ab22ddea59ff739faefe3e6f37543f65cebf38ef89221daaa490074f71
-  data.tar.gz: e68fba8f04a65459c4d5a3d19b7b44f988b1d011327eb880eb06fe3c4dc4e4d3
+  metadata.gz: 5587e14083103040155f39c0f744e14723614d823b3b5d21cb8ca71f607854d2
+  data.tar.gz: fde98a6b36f0acab961236516f6fd23940ee34dd06b6d7cb38826f06cee626b3
 SHA512:
-  metadata.gz: 3626ecad3da53ef920bb01107be4f44d654c9ce88f349283e70a8f00aa46c834072851eb2f1248dd612bf37e548df10214b64f13c59b3eef6c7ed1a81a59e614
-  data.tar.gz: 1cf9a943172c70e97619a4861330a427c0c3e04a4ce95811699f90b17fc73293a2f8d5ae82b0a4f9f21e95d0f12867e7f64b7d51f18520e436756927145d41c6
+  metadata.gz: 6b59f4a0972f377c1e35652fe2d3467b90906a60b0cce66f32438b096971bedf6f593cf8bbf24c8aa26cc0730059a709b312715095379f8354b138df3191b2ca
+  data.tar.gz: 103dfcee88d2b1d811fce57f72e0fb77879fbee77895b2559b6744fecd849b7ce4189b9cba56cac5c6b7d4cbdfa1e8641d59e95a83304590318aa3bd030a951e

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/Main.rb

@@ -177,8 +177,8 @@ Pod::HooksManager.register('cocoapods-ppbuild', :post_install) do |installer_con
         Pod::PrebuildSandbox.replace_tagert_copy_source_sh(installer_context)
     end
 
-    if Podfile::DSL.dont_remove_source_code 
-        require_relative 'Reference/reference_source_code'
+    if !Pod.is_prebuild_stage && Pod::Podfile::DSL.dont_remove_source_code 
+        require_relative 'reference/reference_source_code'
         installer_context.refrence_source_code
     end
 end

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.3"
+  VERSION = "1.0.6"
 end

data/lib/cocoapods-ppbuild/{Reference → reference}/reference_source_code.rb

@@ -15,8 +15,10 @@ module Pod
 	    		proj_path = sandbox_path + get_project_name("Pods")
 	    		project = Xcodeproj::Project.open(proj_path)
     			exsited_framework_pod_names.each do |target_name|
-	    			real_reference("_Prebuild/#{target_name}", proj_path, target_name)
+	    			real_reference("_Prebuild/#{target_name}", project, target_name)
 	    		end
+	    		group = project.main_group.find_subpath(File.join("SourceCode"), true)
+	    		group.sort_by_type
 	    		project.save;
 	    	end
 
@@ -34,14 +36,14 @@ module Pod
 
 	    	#添加文件链接
 			def add_files_to_group(group)
-			  Dir.foreach(group.real_path) do |entry|
-			    filePath = File.join(group.real_path, entry)
-			    # 过滤目录和.DS_Store文件
-			    if entry != ".DS_Store" && !filePath.to_s.end_with?(".meta") &&entry != "." &&entry != ".." then
-			    	# 向group中增加文件引用
-					group.new_reference(filePath)
+				Dir.foreach(group.real_path) do |entry|
+					filePath = File.join(group.real_path, entry)
+					# 过滤目录和.DS_Store文件
+					if entry != ".DS_Store" && !filePath.to_s.end_with?(".meta") &&entry != "." &&entry != ".." then
+						# 向group中增加文件引用
+						group.new_reference(filePath)
+					end
 				end
-			  end
 			end
 	    end
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-ppbuild
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.6
 platform: ruby
 authors:
 - 彭懂
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -49,7 +49,6 @@ files:
 - lib/cocoapods-ppbuild/Integration.rb
 - lib/cocoapods-ppbuild/Main.rb
 - lib/cocoapods-ppbuild/Prebuild.rb
-- lib/cocoapods-ppbuild/Reference/reference_source_code.rb
 - lib/cocoapods-ppbuild/command.rb
 - lib/cocoapods-ppbuild/command/ppbuild.rb
 - lib/cocoapods-ppbuild/gem_version.rb
@@ -59,6 +58,7 @@ files:
 - lib/cocoapods-ppbuild/helper/podfile_options.rb
 - lib/cocoapods-ppbuild/helper/prebuild_sandbox.rb
 - lib/cocoapods-ppbuild/helper/target_checker.rb
+- lib/cocoapods-ppbuild/reference/reference_source_code.rb
 - lib/cocoapods-ppbuild/rome/build_framework.rb
 - lib/cocoapods-ppbuild/tool/tool.rb
 - lib/cocoapods_plugin.rb