cocoapods-kz 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cd6c7deb2a958e5306602d1e1010400b44643a642a27333be9fa8d93405c38f
-  data.tar.gz: 813cf28a218e20fb79a15e284c69dafee039949c2c9c21e4f7467f8350215ade
+  metadata.gz: c043498bc76c19c7f49d1b6f64f00f10535f3512b9eb85853e213e4faa9b4d1c
+  data.tar.gz: e86ca96c094fb8f90d6434d1ce99421c0d4c2d2bca37b0e91f23639f841ea3df
 SHA512:
-  metadata.gz: 61cd3bff4c6e8d50118395abaf1ebcff6e89f6ca9f64d98b636617e62c0c5bb5d8b3d7b5646e4496230d11da36d4a7bf4d9e5f8dec585107b06f3b7ba22d76b4
-  data.tar.gz: 7e47fda547a29835c34f4c761ff9d521aa26bd12f4e19bb37902f7e19751fe970e3b0dd0816204c12bf94d5d5fbca699da35576598ef5ce28bed2fe69e24acaf
+  metadata.gz: 15a3769ef86e707c147f1d8d0f3b03832c316a895869703e501fdf3efb9f365938548bc73b2db8331624d90c9ba714bb41763755696d42e7e64cf800c80729d0
+  data.tar.gz: 70b54fcc641af9ae839c916568e6af18444dc42d00054fcae859e64c9639b780a52eab7320582c15a1c392245fb0cad1cc43cc91557c4ae8716de04c419a6086

data/lib/cocoapods-kz/command/clean.rb

@@ -7,8 +7,7 @@ module Pod
         self.summary = 'pod kz clean 用于清理缓存以一些报错文件'
 
         self.description = <<-DESC
-        在pod update过程中由于代码变动，module缓存容易产生签名过期的问题，部分属性文件，跳转也会存在路径不对的情况，需要清理老旧缓存文件，
-        让Xcode重新生成
+        在pod update过程中由于代码变动，module缓存容易产生签名过期的问题，部分属性文件，跳转也会存在路径不对的情况，需要清理老旧缓存文件，让Xcode重新生成
         DESC
 
         self.arguments = [
@@ -17,42 +16,50 @@ module Pod
 
         def self.options
           [
-            %w[--xcode 清除module缓存与头文件索引问题],
+            ["--xcode", "清除module缓存与头文件索引问题"],
+            ["--framework", "清除所有自生成本地缓存的framework"],
           ]
         end
 
         def initialize(argv)
-          clean_xcode = argv.flag?('xcode')
-          banner! unless clean_xcode
+          @clean_xcode = argv.flag?('xcode')
+          @clean_framework = argv.flag?('framework')
+          banner! unless @clean_xcode || @clean_framework
 
           super
         end
 
         def run
-          xcodeproj_path = Pathname.new(Dir[Pod::Config.instance.installation_root + "*.xcodeproj"].first)
-          return unless xcodeproj_path
+          if @clean_xcode
+            xcodeproj_path = Pathname.new(Dir[Pod::Config.instance.installation_root + "*.xcodeproj"].first)
+            return unless xcodeproj_path
 
-          xcode_derived_data_path = Pathname.new(Dir.home + "/Library/Developer/Xcode/DerivedData")
-          module_cache_noindex_path = xcode_derived_data_path + "ModuleCache.noindex"
-          FileUtils.rm_rf(module_cache_noindex_path) if module_cache_noindex_path.exist?
+            xcode_derived_data_path = Pathname.new(Dir.home + "/Library/Developer/Xcode/DerivedData")
+            module_cache_noindex_path = xcode_derived_data_path + "ModuleCache.noindex"
+            FileUtils.rm_rf(module_cache_noindex_path) if module_cache_noindex_path.exist?
 
-          project_name = xcodeproj_path.basename.to_s.split(".").first
-          Dir.foreach(xcode_derived_data_path) do |file_name|
-            next if file_name == '.' || file_name == '..' || file_name == '.DS_Store'
+            project_name = xcodeproj_path.basename.to_s.split(".").first
+            Dir.foreach(xcode_derived_data_path) do |file_name|
+              next if file_name == '.' || file_name == '..' || file_name == '.DS_Store'
 
-            if file_name.start_with?(project_name)
-              project_path = xcode_derived_data_path + file_name
-              index_noindex_path = project_path + "Index.noindex"
-              FileUtils.rm_rf(index_noindex_path) if index_noindex_path.exist?
+              if file_name.start_with?(project_name)
+                project_path = xcode_derived_data_path + file_name
+                index_noindex_path = project_path + "Index.noindex"
+                FileUtils.rm_rf(index_noindex_path) if index_noindex_path.exist?
+              end
+            end
+
+            default_xcode_path = Pathname.new('/Applications/Xcode.app')
+            if default_xcode_path.exist?
+              system("osascript -e 'quit app \"Xcode\"'")
+              sleep 1
+              workspace_path = Dir[Pod::Config.instance.installation_root + "*.xcworkspace"].first
+              system("open \"#{workspace_path}\"")
             end
           end
 
-          default_xcode_path = Pathname.new('/Applications/Xcode.app')
-          if default_xcode_path.exist?
-            system("osascript -e 'quit app \"Xcode\"'")
-            sleep 1
-            workspace_path = Dir[Pod::Config.instance.installation_root + "*.xcworkspace"].first
-            system("open \"#{workspace_path}\"")
+          if @clean_framework
+            FileUtils.rm_r(KZ::KZ_POD_CONFIG_ROOT) if File.exist?(KZ::KZ_POD_CONFIG_ROOT)
           end
         end
       end

data/lib/cocoapods-kz/command/info.rb

@@ -0,0 +1,37 @@
+require 'json'
+
+module Pod
+  class Command
+    class Kz < Command
+      class Info < Kz
+        self.summary = 'pod kz info，用于打印项目pod信息'
+
+        self.description = <<-DESC
+        结合可选子命令用于执行各种修补脚本
+        DESC
+
+        def initialize(argv)
+          KZ::KZGlobalHelper.instance.analyze_special_parameters(true, false, argv.arguments!)
+          KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
+          super
+        end
+
+        def run
+          installer = installer_for_config
+          installer.prepare
+          installer.resolve_dependencies
+          installer.download_dependencies
+
+          result_info = {}
+          KZ::KZGlobalHelper.instance.kz_analyzer.all_kz_pod_targets.values.each do |kz_pod_target|
+            pod_info = {}
+            pod_info["path"] = kz_pod_target.native_pod_target.sandbox.pod_dir(kz_pod_target.name)
+            pod_info["is_dev"] = kz_pod_target.is_dev_pod
+            result_info[kz_pod_target.name] = pod_info
+          end
+          puts result_info.to_json
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-kz/command/install.rb

@@ -22,14 +22,16 @@ module Pod
             ['--framework', "后面需要跟上pod名(多个pod，使用英文逗号隔开)，支持追加*匹配任意内容"],
             ['--code', "后面需要跟上pod名(多个pod，使用英文逗号隔开)，支持追加*匹配任意内容"],
             ['--debug', "debug模式，会打印调试日志或生成调试文件"],
-            ['--no-framework-update', "build后不再生成frameowrk"]
+            ['--framework-update', "build后不再生成frameowrk"],
+            ['--arm64-simulator', "适配模拟器的arm64模式，会自动将只支持真机arm64的framework转成arm64模式"]
           ].concat(super).reject { |(name, _)| name == '--no-repo-update' }
         end
 
         def initialize(argv)
           use_code_tag = argv.flag?('code')
           use_framework_tag = argv.flag?('framework')
-          banner! if use_code_tag && use_framework_tag
+          banner! unless isOptionsArgvFlag(argv.options.keys)
+          banner! if (use_code_tag && use_framework_tag)
 
           KZ::KZGlobalHelper.instance.analyze_special_parameters(use_code_tag, use_framework_tag, argv.arguments!)
           if Pod.match_version?('~> 1.11')
@@ -37,12 +39,20 @@ module Pod
             KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
           end
           KZ::KZGlobalHelper.instance.debug = true if argv.flag?('debug')
-          KZ::KZGlobalHelper.instance.disable_generate_framework = true if argv.flag?('framework-update') != nil
+          KZ::KZGlobalHelper.instance.arm64_simulator = true if argv.flag?('arm64-simulator')
+          framework_update = argv.flag?('framework-update')
+          KZ::KZGlobalHelper.instance.disable_generate_framework = true if (framework_update != nil && framework_update == false)
 
           super
           @additional_args = argv.remainder!
         end
 
+        def isOptionsArgvFlag(all_flags)
+          return true if all_flags.empty?
+          supported_flags = ["repo-update", "deployment", "clean-install", "code", "framework", "debug", "framework-update", "arm64-simulator"]
+          return (all_flags & supported_flags) == all_flags
+        end
+
         def run
           KZ::KZGlobalHelper.instance.prepare
           install = Pod::Command::Install.new(CLAide::ARGV.new([*@additional_args]))

data/lib/cocoapods-kz/command/kz.rb

@@ -2,6 +2,7 @@ require_relative 'install'
 require_relative 'update'
 require_relative 'repair'
 require_relative 'clean'
+require_relative 'info'
 
 module Pod
   class Command

data/lib/cocoapods-kz/command/repair.rb

@@ -35,6 +35,7 @@ module Pod
           installer = installer_for_config
           installer.prepare
           installer.resolve_dependencies
+          installer.download_dependencies
 
           if @repair_dynamic_swift
             KZ::KZSwiftAttachOCFeature.new.repair

data/lib/cocoapods-kz/command/update.rb

@@ -22,14 +22,16 @@ module Pod
             ['--framework', "后面需要跟上pod名(多个pod，使用英文逗号隔开)，支持追加*匹配任意内容"],
             ['--code', "后面需要跟上pod名(多个pod，使用英文逗号隔开)，支持追加*匹配任意内容"],
             ['--debug', "debug模式，会打印调试日志或生成调试文件"],
-            ['--no-framework-update', "build后不再生成frameowrk"]
+            ['--no-framework-update', "build后不再生成frameowrk"],
+            ['--arm64-simulator', "适配模拟器的arm64模式，会自动将只支持真机arm64的framework转成arm64模式"]
           ].concat(super)
         end
 
         def initialize(argv)
           use_code_tag = argv.flag?('code')
           use_framework_tag = argv.flag?('framework')
-          banner! if use_code_tag && use_framework_tag
+          banner! unless isOptionsArgvFlag(argv.options.keys)
+          banner! if (use_code_tag && use_framework_tag)
 
           KZ::KZGlobalHelper.instance.analyze_special_parameters(use_code_tag, use_framework_tag, argv.arguments!)
           if Pod.match_version?('~> 1.11')
@@ -37,12 +39,20 @@ module Pod
             KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
           end
           KZ::KZGlobalHelper.instance.debug = true if argv.flag?('debug')
-          KZ::KZGlobalHelper.instance.disable_generate_framework = true if argv.flag?('framework-update') != nil
+          KZ::KZGlobalHelper.instance.arm64_simulator = true if argv.flag?('arm64-simulator')
+          framework_update = argv.flag?('framework-update')
+          KZ::KZGlobalHelper.instance.disable_generate_framework = true if (framework_update != nil && framework_update == false)
 
           super
           @additional_args = argv.remainder!
         end
 
+        def isOptionsArgvFlag(all_flags)
+          return true if all_flags.empty?
+          supported_flags = ["sources", "exclude-pods", "clean-install", "code", "framework", "debug", "framework-update", "arm64-simulator"]
+          return (all_flags & supported_flags) == all_flags
+        end
+
         def run
           KZ::KZGlobalHelper.instance.prepare
           update = Pod::Command::Update.new(CLAide::ARGV.new([*@additional_args]))

data/lib/cocoapods-kz/gem_version.rb

@@ -1,5 +1,5 @@
 module CocoapodsKz
-  VERSION = "0.0.9"
+  VERSION = "0.0.11"
 end
 
 module Pod

data/lib/cocoapods-kz/helpers/kz_analyzer.rb

@@ -20,18 +20,32 @@ module KZ
       # 检测是否有product名称相同的target
       temp_repeat_product_name = []
       @all_kz_pod_targets.each do |name, kz_pod_target|
-        if temp_repeat_product_name.include?(kz_pod_target.product_name)
+        result = KZGlobalHelper.instance.pod_config_result_with_target(kz_pod_target)
+        if temp_repeat_product_name.include?("#{kz_pod_target.product_name}_#{kz_pod_target.platform_name}")
           kz_pod_target.product_name = "#{kz_pod_target.name}.framework"
           kz_pod_target.product_basename = kz_pod_target.name
-          result = KZGlobalHelper.instance.pod_config_result_with_target(kz_pod_target)
           if result
-            kz_pod_target.repair_modulemap_path = result.resource_path + kz_pod_target.product_name + "Modules/module.modulemap"
+            kz_pod_target.repair_modulemap_path = "${PODS_XCFRAMEWORKS_BUILD_DIR}/#{kz_pod_target.root_name}/#{kz_pod_target.product_name}/Modules/module.modulemap"
+            if kz_pod_target.origin_uses_swift?
+              kz_pod_target.repair_swift_include_path = "${PODS_XCFRAMEWORKS_BUILD_DIR}/#{kz_pod_target.root_name}/#{kz_pod_target.product_name}/Modules"
+            end
           else
-            kz_pod_target.repair_modulemap_path = "${PODS_CONFIGURATION_BUILD_DIR}/#{kz_pod_target.name}/#{kz_pod_target.product_name}/Modules/module.modulemap"
+            kz_pod_target.repair_modulemap_path = "#{kz_pod_target.native_pod_target.configuration_build_dir}/#{kz_pod_target.product_name}/Modules/module.modulemap"
+            if kz_pod_target.origin_uses_swift?
+              kz_pod_target.repair_swift_include_path = "#{kz_pod_target.native_pod_target.configuration_build_dir}/#{kz_pod_target.product_name}/Modules"
+            end
           end
           kz_pod_target.need_repair_module_import = true
-        elsif kz_pod_target.should_build?
-          temp_repeat_product_name << kz_pod_target.product_name
+        elsif kz_pod_target.origin_should_build?
+          temp_repeat_product_name << "#{kz_pod_target.product_name}_#{kz_pod_target.platform_name}"
+        end
+
+        if kz_pod_target.force_load
+          if result
+            kz_pod_target.force_load_info = "${PODS_XCFRAMEWORKS_BUILD_DIR}/#{kz_pod_target.root_name}/#{kz_pod_target.product_name}/#{kz_pod_target.product_basename}"
+          else
+            kz_pod_target.force_load_info = "#{kz_pod_target.configuration_build_dir(true)}/#{kz_pod_target.product_name}/#{kz_pod_target.product_basename}"
+          end
         end
       end
     end

data/lib/cocoapods-kz/helpers/kz_config_result.rb

@@ -30,7 +30,7 @@ module KZ
         next if framework_name == '.' || framework_name == '..' || framework_name == '.DS_Store'
 
         framework_path = @resource_path + framework_name
-        if File.directory?(framework_path) && framework_name.end_with?(".framework")
+        if File.directory?(framework_path) && framework_name.end_with?(".xcframework")
           framework_paths << framework_path
         end
       end

data/lib/cocoapods-kz/helpers/kz_framework_manager.rb

@@ -1,6 +1,8 @@
 require_relative 'kz_pod_target'
 require_relative 'kz_global_helper'
 require_relative 'kz_config_result'
+require 'tmpdir'
+require_relative 'kz_log'
 
 module KZ
   class KZFrameworkManager
@@ -35,7 +37,7 @@ module KZ
               Dir.foreach(version_folder) do |file_name|
                 next if file_name == '.' || file_name == '..' || file_name == '.DS_Store'
 
-                if file_name.end_with?(".framework") && File.directory?(version_folder + file_name)
+                if file_name.end_with?(".xcframework") && File.directory?(version_folder + file_name)
                   have_framework = true
                   break
                 end
@@ -48,5 +50,169 @@ module KZ
       @@all_resources_cache_info
     end
 
+    def self.handle_origin_framework(origin_frameworks, kz_pod_target)
+      new_frameworks = []
+      destination_path = kz_pod_target.pod_config_cache_path(false, true)
+      origin_frameworks.each do |origin_framework_path|
+        if kz_pod_target.disable_to_simulator_frameworks.include?(origin_framework_path)
+          new_frameworks.append(origin_framework_path)
+        else
+          new_framework_path = self.convert_arm64_to_simulator(origin_framework_path, destination_path)
+          if new_framework_path == origin_framework_path
+            kz_pod_target.disable_to_simulator_frameworks.append(origin_framework_path)
+          end
+          new_frameworks.append(new_framework_path)
+        end
+      end
+      new_frameworks
+    end
+
+    def self.convert_arm64_to_simulator(origin_framework_path, destination_path)
+      framework_name = origin_framework_path.basename.to_s
+      if framework_name.end_with?(".framework")
+        framework_basename = framework_name.chomp(".framework")
+        xcframework_path = destination_path + "#{framework_basename}.xcframework"
+        return xcframework_path if File.exist?(xcframework_path) && !Dir.empty?(xcframework_path)
+
+        if self.create_xcframework(origin_framework_path, origin_framework_path, framework_basename, xcframework_path)
+          return xcframework_path
+        else
+          return origin_framework_path
+        end
+      elsif framework_name.end_with?(".xcframework")
+        framework_basename = framework_name.chomp(".xcframework")
+        xcframework_path = destination_path + "#{framework_basename}.xcframework"
+        return xcframework_path if File.exist?(xcframework_path)
+
+        info_plist_path = origin_framework_path + "Info.plist"
+        return origin_framework_path unless File.exist?(info_plist_path)
+
+        info_plist = Xcodeproj::Plist.read_from_path(info_plist_path)
+        available_libraries = info_plist["AvailableLibraries"]
+        available_libraries.each do |available_librarie|
+          if available_librarie["SupportedPlatformVariant"] == "simulator" && available_librarie["SupportedArchitectures"].include?("arm64")
+            return origin_framework_path
+          end
+        end
+
+        # 找到真机arm64 framework与模拟器x86_64 framework
+        xc_framework_path = ""
+        xc_simulator_framework_path = ""
+        available_libraries.each do |available_librarie|
+          if available_librarie["SupportedPlatformVariant"] == "simulator"
+            if available_librarie["SupportedArchitectures"].include?("x86_64")
+              xc_simulator_framework_path = origin_framework_path + available_librarie["LibraryIdentifier"] + available_librarie["LibraryPath"]
+            end
+          elsif available_librarie["SupportedPlatform"] == "ios"
+              if available_librarie["SupportedArchitectures"].include?("arm64")
+                xc_framework_path = origin_framework_path + available_librarie["LibraryIdentifier"] + available_librarie["LibraryPath"]
+              end
+          end
+        end
+
+        xc_simulator_framework_path = xc_framework_path unless xc_simulator_framework_path != ""
+        if self.create_xcframework(xc_framework_path, xc_simulator_framework_path, framework_basename, xcframework_path)
+          return xcframework_path
+        else
+          return origin_framework_path
+        end
+      else
+        return origin_framework_path
+      end
+    end
+
+    def self.create_xcframework(origin_framework_path, origin_simulator_framework_path, framework_basename, destination_xcframework_path)
+      tempdir = Pathname(Dir.mktmpdir)
+      arm64_path = tempdir + "arm64"
+      FileUtils.mkdir_p(arm64_path)
+      arm64_framework_path = arm64_path + "#{framework_basename}.framework"
+      FileUtils.cp_r(origin_framework_path, arm64_framework_path)
+      arm64_framework_exe_path = arm64_framework_path + framework_basename
+      if self.contain_multiple_arch?(arm64_framework_exe_path)
+        system("lipo #{arm64_framework_exe_path} -thin arm64 -output #{arm64_framework_exe_path} #{KZGlobalHelper.instance.debug_shell_log_tag}")
+      end
+
+      simulator_path = tempdir + "simulator"
+      FileUtils.mkdir_p(simulator_path)
+      simulator_framework_path = simulator_path + "#{framework_basename}.framework"
+      FileUtils.cp_r(origin_simulator_framework_path, simulator_framework_path)
+      simulator_framework_exe_path = simulator_framework_path + framework_basename
+      contain_x8664 = self.contain_x8664?(simulator_framework_exe_path)
+      if contain_x8664
+        system("lipo #{simulator_framework_exe_path} -thin x86_64 -output #{simulator_framework_exe_path} #{KZGlobalHelper.instance.debug_shell_log_tag}")
+      else
+        FileUtils.rm(simulator_framework_exe_path)
+      end
+
+      temp_framwork_exe_path = tempdir + "#{framework_basename}_arm64_simulator"
+
+      if self.is_dynamic_library?(origin_framework_path + framework_basename)
+        xcrun_vtool_show_result = `xcrun vtool -arch arm64 -show #{origin_framework_path + framework_basename}`.lines.map(&:chomp)
+        framework_sdk_version = "16.0"
+        framework_deployment_version = "12.0"
+        reach_cmd_tag = false
+        xcrun_vtool_show_result.each do |line|
+          reach_cmd_tag = false if line.start_with?("Load command")
+
+          line_infos = line.lstrip.split
+          next unless  line_infos.count == 2
+
+          if line_infos.first == "cmd" && line_infos.last == "LC_VERSION_MIN_IPHONEOS"
+            reach_cmd_tag = true
+          end
+
+          if reach_cmd_tag
+            if line_infos.include?("sdk")
+              framework_sdk_version = line_infos.last
+            elsif line_infos.include?("version")
+              framework_deployment_version = line_infos.last
+            end
+          end
+        end
+        xcrun_vtool_set_result = system("xcrun vtool -arch arm64 -set-build-version 7 #{framework_deployment_version} #{framework_sdk_version} -replace -output #{temp_framwork_exe_path} #{arm64_framework_exe_path}")
+        unless xcrun_vtool_set_result
+          FileUtils.rm_r(tempdir)
+          return false
+        end
+      else
+        ar_x_path = tempdir + "ar_x"
+        FileUtils.mkdir_p(ar_x_path)
+        ar_x_success = system("cd #{ar_x_path}; ar x #{arm64_framework_exe_path}")
+        if ar_x_success
+          system("for file in #{ar_x_path}/*.o; do #{ARM64_TO_SIMULATOR_EXECUTE_PATH} $file; done")
+          system("ar crv #{temp_framwork_exe_path} #{ar_x_path}/*.o &> /dev/null")
+        else
+          FileUtils.rm_r(tempdir)
+          return false
+        end
+      end
+
+      if contain_x8664
+        system("lipo -create #{temp_framwork_exe_path} #{simulator_framework_exe_path} -output #{simulator_framework_exe_path} #{KZGlobalHelper.instance.debug_shell_log_tag}")
+      else
+        FileUtils.mv("#{temp_framwork_exe_path}", simulator_framework_exe_path)
+      end
+      FileUtils.mkdir_p(destination_xcframework_path) unless File.exist?(destination_xcframework_path)
+      system("xcodebuild -create-xcframework -framework $(readlink -f '#{arm64_framework_path}') -framework $(readlink -f '#{simulator_framework_path}') -output #{destination_xcframework_path} #{KZGlobalHelper.instance.debug_shell_log_tag}")
+      FileUtils.rm_r(tempdir)
+
+      return true
+    end
+
+    def self.is_dynamic_library?(file_path)
+      file_result = `file -b #{file_path}`
+      return file_result.include?("dynamically linked shared library")
+    end
+
+    def self.contain_x8664?(file_path)
+      file_result = `file -b #{file_path}`
+      return file_result.include?("for architecture x86_64")
+    end
+
+    def self.contain_multiple_arch?(file_path)
+      file_result = `lipo -info #{file_path}`
+      return file_result.include?("Architectures in the fat file")
+    end
+
   end
 end

data/lib/cocoapods-kz/helpers/kz_generator.rb

@@ -15,7 +15,7 @@ module KZ
 
       build_phase = native_target.new_shell_script_build_phase('[KZ] Generate Framework')
       build_phase.show_env_vars_in_log = '0'
-      build_phase.output_paths = ['${KZ_FRAMEWORK_CACHE_PATH}/${FULL_PRODUCT_NAME}']
+      build_phase.output_paths = ['${KZ_FRAMEWORK_CACHE_PATH}/${PRODUCT_NAME}.xcframework']
       build_phase.shell_script = KZ.deal_path_for_xcconfig(KZ_GENERATOR_FRAMEWORK_PATH, true)
     end
 
@@ -34,6 +34,15 @@ module KZ
       xml_rule.script = KZ.deal_path_for_xcconfig(KZ_XML_BUILD_PATH, true)
     end
 
+    def add_force_load_exe_path_build_phase(native_target, output_path)
+      return if KZ::KZGlobalHelper.instance.disable_generate_framework
+
+      build_phase = native_target.new_shell_script_build_phase('[KZ] Froce Load File Output Path')
+      build_phase.show_env_vars_in_log = '0'
+      build_phase.output_paths = [output_path]
+      build_phase.shell_script = KZ.deal_path_for_xcconfig(KZ_FIX_FORCE_LOAD_EXE, true)
+    end
+
     def new_build_rule(project, native_target, name)
       new_rule = nil
       native_target.build_rules.each do |build_rule|
@@ -99,15 +108,19 @@ module KZ
 
         if all_repair_hmap_info.count > 0
           hmap_cache_path = kz_pod_target.pod_config_cache_path(false)
+          FileUtils.mkdir_p(hmap_cache_path) unless File.exist?(hmap_cache_path)
+
           save_hmap_file(all_repair_hmap_info, hmap_cache_path, target_name + '_repair')
           kz_pod_target.repair_header_search_path = hmap_cache_path + "#{target_name}_repair.hmap"
         end
 
         # 添加私有头文件引用
-        if kz_pod_target.should_build?
+        if kz_pod_target.current_should_build?
           private_hamp_info = private_hmap_info(kz_pod_target)
           if private_hamp_info.count > 0
             hmap_cache_path = kz_pod_target.pod_config_cache_path(false)
+            FileUtils.mkdir_p(hmap_cache_path) unless File.exist?(hmap_cache_path)
+
             save_hmap_file(private_hamp_info, hmap_cache_path, target_name)
             kz_pod_target.private_header_search_path = hmap_cache_path + "#{target_name}.hmap"
           end
@@ -132,13 +145,14 @@ module KZ
 
     def clean_hmap_cache(kz_pod_target)
       hmap_cache_path = kz_pod_target.pod_config_cache_path(false)
+
       Dir.foreach(hmap_cache_path) do |file_name|
         next if file_name == '.' || file_name == '..' || file_name == '.DS_Store'
 
         if file_name.end_with?(".hmap", ".json")
           FileUtils.rm(hmap_cache_path + file_name) if File.exist?(hmap_cache_path + file_name)
         end
-      end
+      end if File.exist?(hmap_cache_path)
     end
 
     def repair_hmap_info(kz_pod_target)
@@ -169,7 +183,7 @@ module KZ
     def private_hmap_info(kz_pod_target)
       header_paths = kz_pod_target.all_headers
       # 更新Headers
-      if kz_pod_target.is_dev_pod && kz_pod_target.should_build?
+      if kz_pod_target.is_dev_pod
         header_paths.each do |header_pathname|
           symlink_path = kz_pod_target.local_private_headers_path + header_pathname.basename
           File.symlink(header_pathname, symlink_path) unless File.symlink?(symlink_path) || File.exist?(symlink_path)
@@ -196,7 +210,7 @@ module KZ
           hmap_info[kz_pod_target.product_basename + '/' + header_pathname_basename] = header_hmap_value_quotes
         end
 
-        if kz_pod_target.uses_swift && kz_pod_target.is_dev_pod
+        if kz_pod_target.current_uses_swift? && kz_pod_target.is_dev_pod
           # 修改SPBoss-Swift.h文件的导入方式
           swift_bridge_file_name = "#{kz_pod_target.name}-Swift.h"
           hmap_info[swift_bridge_file_name] = { 'suffix' => swift_bridge_file_name, 'prefix' => "#{kz_pod_target.name}/" }

data/lib/cocoapods-kz/helpers/kz_global_helper.rb

@@ -11,16 +11,19 @@ module KZ
   KZ_POD_CONFIG_ROOT = Pod::Config.instance.installation_root + 'Pods/KZPodConfigure'
   KZ_POD_CONFIG_SUPPORT_FILES = KZ_POD_CONFIG_ROOT + 'SupportFiles'
   KZ_POD_CONFIG_POD_TARGETS = KZ_POD_CONFIG_ROOT + 'PodTargets'
+  KZ_POD_CONFIG_POD_TEMPDIR = KZ_POD_CONFIG_ROOT + '.tempdir'
   KZ_POD_CONFIG_ROOT_STR = "${PODS_ROOT}/KZPodConfigure"
   # 修复pod lib报错问题
   Pod::Config.instance.installation_root = nil
 
   HMAP_EXECUTE_PATH = File.dirname(__FILE__) + '/../resources/hmap'
   FLEX_COMPLIER_PATH = KZ_POD_CONFIG_SUPPORT_FILES + 'FlexCompiler'
-  KZ_MERGE_SWIFT_H_PATH = KZ_POD_CONFIG_SUPPORT_FILES + 'kz_merge_swift_h.rb'
+  ARM64_TO_SIMULATOR_EXECUTE_PATH = File.dirname(__FILE__) + '/../resources/arm64ToSimulator'
   KZ_GENERATOR_FRAMEWORK_PATH = KZ_POD_CONFIG_SUPPORT_FILES + 'kz_generator_framework.sh'
   KZ_XML_BUILD_PATH = KZ_POD_CONFIG_SUPPORT_FILES + 'kz_xml_build.sh'
   KZ_LOCK_FILE_PATH = KZ_POD_CONFIG_ROOT + 'KZConfigLock'
+  KZ_FIX_FORCE_LOAD_EXE = KZ_POD_CONFIG_SUPPORT_FILES + 'kz_fix_force_load_exe.sh'
+  KZ_FEFRESH_PODS_PBXPROJ = KZ_POD_CONFIG_SUPPORT_FILES + 'kz_refresh_pods_pbxproj.rb'
 
   def self.deal_path_for_xcconfig(path, add_quotes = false)
     if path.is_a?(String)
@@ -46,6 +49,8 @@ module KZ
     attr_accessor :kz_config_lock
     attr_accessor :disable_generate_framework
     attr_accessor :generate_kz_pod_targets
+    attr_accessor :debug_shell_log_tag
+    attr_accessor :arm64_simulator
 
     private_class_method :new
 
@@ -58,6 +63,15 @@ module KZ
       @disable_generate_framework = false
       @generate_kz_pod_targets = false
       @olde_lock_file_content = nil
+      @debug_shell_log_tag = "&> /dev/null"
+      @arm64_simulator = false
+    end
+
+    def debug=(value)
+      @debug = value
+      if debug
+        @debug_shell_log_tag = ""
+      end
     end
 
     @@instance = nil
@@ -74,21 +88,24 @@ module KZ
         end
         FileUtils.mkdir_p(KZ_POD_CONFIG_SUPPORT_FILES) unless File.exist?(KZ_POD_CONFIG_SUPPORT_FILES)
         FileUtils.mkdir_p(KZ_POD_CONFIG_POD_TARGETS) unless File.exist?(KZ_POD_CONFIG_POD_TARGETS)
+        FileUtils.mkdir_p(KZ_POD_CONFIG_POD_TEMPDIR) unless File.exist?(KZ_POD_CONFIG_POD_TEMPDIR)
 
         FileUtils.rm(FLEX_COMPLIER_PATH) if File.exist?(FLEX_COMPLIER_PATH)
         FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler', FLEX_COMPLIER_PATH)
         system("chmod +x #{FLEX_COMPLIER_PATH}")
 
-        FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/kz_merge_swift_h.rb', KZ_MERGE_SWIFT_H_PATH)
-
         FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/kz_generator_framework.sh', KZ_GENERATOR_FRAMEWORK_PATH)
         system("chmod +x #{KZ_GENERATOR_FRAMEWORK_PATH}")
 
         FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/kz_xml_build.sh', KZ_XML_BUILD_PATH)
         system("chmod +x #{KZ_XML_BUILD_PATH}")
 
+        FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/kz_fix_force_load_exe.sh', KZ_FIX_FORCE_LOAD_EXE)
+        system("chmod +x #{KZ_FIX_FORCE_LOAD_EXE}")
+
+        FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/kz_refresh_pods_pbxproj.rb', KZ_FEFRESH_PODS_PBXPROJ)
+
         Pod::Config.instance.podfile.use_frameworks!(:linkage => :static)
-        Pod::Config.instance.podfile.install!("cocoapods", :deterministic_uuids => false)
       else
         @kz_pod_enable = false
         @generate_kz_pod_targets = false

data/lib/cocoapods-kz/helpers/kz_log.rb

@@ -0,0 +1,11 @@
+module KZ
+
+  class KZLog
+    def self.log(logStr)
+      if KZGlobalHelper.instance.debug
+        puts logStr
+      end
+    end
+  end
+end
+