cocoapods-kz 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8897bc08210ec4f9d4ceb2c3a4004e9535264667432a09c8eabb3c37c81e090d
-  data.tar.gz: 58cda02e1cba05f25c87c1c75701de1fa23077075d6976daf1b396a1f3483fb4
+  metadata.gz: 1d054c8e5514bb6136c627613b061ced1961f9f069d0c6160718f060d8394b4d
+  data.tar.gz: cced90a605f5652c04c46f39d4f44ef3ab21da9131842b3cbbe22fe0bb8eb58c
 SHA512:
-  metadata.gz: eee9d236f5b1f1b4a32b31ce6b385548fe2a847f79cd8f1729f7643f4485086d26db831cb67361ee282be1f613081ea567b921ae35a3b6f3aaead3fdde6114ff
-  data.tar.gz: 89a2b27fd83674b77c50bec39e8a115da01c462d42f4a023e78f84d15f1ccd975ae53c3d3c5f79dd6388e91575fc0de9c5f3570af07ac06eb2156f18bf478e06
+  metadata.gz: 5b83c0a3b25538cf2d6dfff81c419de10062a93ec78480fc3022df7c751e7bb920d130f6d2f93740bfed80fd4c80b335979606d5d649cc75c6e3bbca4297020a
+  data.tar.gz: 6deb0853f199c345a66bfef9e0f10da7d1493bc20a6bc1b05c14ef4bae455f3187658b14c42d90bca096085557ab1aee3153d2feee22621c360cbc5a2dd4cbac

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

@@ -12,9 +12,8 @@ module Pod
 
         def initialize(argv)
           if Pod.match_version?('~> 1.11')
-            KZ::KZGlobalHelper.instance.kz_pod_enable = true
-            KZ::KZGlobalHelper.instance.analyze_special_parameters(true, false, argv.arguments!)
             KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
+            KZ::KZGlobalHelper.instance.analyze_special_parameters(true, false, argv.arguments!)
           end
           super
         end
@@ -26,14 +25,36 @@ module Pod
           installer.download_dependencies
 
           result_info = {}
+          main_project = installer.aggregate_targets.first.user_project
+          result_info[main_project.root_object.display_name] = {
+            "path": main_project.project_dir.to_s
+          }
           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
+            dependent_target_names = []
+            kz_pod_target.native_pod_target.dependent_targets.each do |native_dependent_target|
+              traverse_dependent_targets(native_dependent_target) do |target|
+                dependent_target_names.append(target.name)
+              end
+            end
+            pod_info["dependent_target_names"] = dependent_target_names
             result_info[kz_pod_target.name] = pod_info
           end
           puts result_info.to_json
         end
+
+        def traverse_dependent_targets(native_dependent_target)
+          if native_dependent_target.dependent_targets.count > 0
+            yield(native_dependent_target)
+            native_dependent_target.dependent_targets.each do |sub_native_dependent_target|
+              traverse_dependent_targets(sub_native_dependent_target) do |target|
+                yield(target)
+              end
+            end
+          end
+        end
       end
     end
   end

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

@@ -34,10 +34,6 @@ module Pod
           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')
-            KZ::KZGlobalHelper.instance.kz_pod_enable = true
-            KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
-          end
           KZ::KZGlobalHelper.instance.debug = true if argv.flag?('debug')
           KZ::KZGlobalHelper.instance.arm64_simulator = true if argv.flag?('arm64-simulator')
           framework_update = argv.flag?('framework-update')

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

@@ -15,18 +15,15 @@ module Pod
           [
             ['--module-import', "指定组件名(只针对开发组件)，修复该组件所有文件头文件导入方式，壳工程使用“Main”，如果不指定，默认对所有开发组件进行修复"],
             ['--dynamic-swift', "指定组件名(只针对开发组件)，将该组件中所有swift文件添加OC特性，壳工程使用“Main”，如果不指定，默认对所有开发组件进行修复"],
-            ['--private-hmap', "重新生成组件私有hamp"],
           ]
         end
 
         def initialize(argv)
           @repair_module_import = argv.flag?('module-import')
           @repair_dynamic_swift = argv.flag?('dynamic-swift')
-          @repair_private_hmap = argv.flag?('private-hmap')
-          banner! unless @repair_module_import || @repair_dynamic_swift || @repair_private_hmap
+          banner! unless @repair_module_import || @repair_dynamic_swift
 
           if Pod.match_version?('~> 1.11')
-            KZ::KZGlobalHelper.instance.kz_pod_enable = true
             KZ::KZGlobalHelper.instance.analyze_special_parameters(true, false, argv.arguments!)
             KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
           end
@@ -35,21 +32,15 @@ module Pod
         end
 
         def run
-          KZ::KZGlobalHelper.instance.prepare
-
-          if KZ::KZGlobalHelper.instance.kz_pod_enable
-            installer = installer_for_config
-            installer.prepare
-            installer.resolve_dependencies
-            installer.download_dependencies
-
-            if @repair_dynamic_swift
-              KZ::KZSwiftAttachOCFeature.new.repair
-            elsif @repair_module_import
-              KZ::KZRepairModuleImport.new(installer.aggregate_targets.first.user_project).repair
-            else @repair_private_hmap
-            KZ::KZGlobalHelper.instance.kz_generator.create_hamp
-            end
+          installer = installer_for_config
+          installer.prepare
+          installer.resolve_dependencies
+          installer.download_dependencies
+
+          if @repair_dynamic_swift
+            KZ::KZSwiftAttachOCFeature.new.repair
+          elsif @repair_module_import
+            KZ::KZRepairModuleImport.new(installer.aggregate_targets.first.user_project).repair
           end
         end
       end

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

@@ -34,10 +34,6 @@ module Pod
           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')
-            KZ::KZGlobalHelper.instance.kz_pod_enable = true
-            KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
-          end
           KZ::KZGlobalHelper.instance.debug = true if argv.flag?('debug')
           KZ::KZGlobalHelper.instance.arm64_simulator = true if argv.flag?('arm64-simulator')
           framework_update = argv.flag?('framework-update')

data/lib/cocoapods-kz/gem_version.rb

@@ -1,5 +1,5 @@
 module CocoapodsKz
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end
 
 module Pod

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

@@ -39,12 +39,15 @@ module KZ
           @pod_of_flexlib_info.have_kzswiftui_pod = true
         end
       }
+      KZ::KZLog.log("已经完成所有pod解析", :success)
+      return unless KZGlobalHelper.instance.kz_pod_enable
 
       # 检测是否有product名称相同的target
       temp_repeat_product_name = []
       @all_kz_pod_targets.each do |name, kz_pod_target|
         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}")
+        temp_name = "#{kz_pod_target.product_name}_#{kz_pod_target.platform_name}"
+        if temp_repeat_product_name.include?(temp_name)
           kz_pod_target.product_name = "#{kz_pod_target.name}.framework"
           kz_pod_target.product_basename = kz_pod_target.name
           if result
@@ -59,8 +62,9 @@ module KZ
             end
           end
           kz_pod_target.need_repair_module_import = true
+          KZLog.log("检测到多个target编译产物名均为：#{temp_name}，已配置#{kz_pod_target.name}使用新产物名：#{kz_pod_target.name}.framework，并使用modulemap进行修复引用方式保持不变", :info)
         elsif kz_pod_target.origin_should_build?
-          temp_repeat_product_name << "#{kz_pod_target.product_name}_#{kz_pod_target.platform_name}"
+          temp_repeat_product_name << "#{temp_name}"
         end
 
         if kz_pod_target.force_load
@@ -69,6 +73,7 @@ module KZ
           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
+          KZLog.log("'#{kz_pod_target.name}'开启force load，已配置其framework在链接时会使用-force-load", :info)
         end
       end
     end
@@ -77,7 +82,9 @@ module KZ
       native_pod_target_name = native_pod_target.name
       if @all_kz_pod_targets.has_key?(native_pod_target_name)
         kz_pod_target = @all_kz_pod_targets[native_pod_target_name]
-        kz_pod_target.config_pod_mode = config_pod_mode unless kz_pod_target.is_dev_pod
+        if !kz_pod_target.is_dev_pod && config_pod_mode != :kz_pod_origin_mode
+          kz_pod_target.config_pod_mode = config_pod_mode
+        end
       else
         kz_pod_target = KZPodTarget.new(native_pod_target)
         is_dev_pod = @development_pods.include?(native_pod_target_name)

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

@@ -115,7 +115,9 @@ module KZ
         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
+            FileUtils.mkdir_p(destination_path) unless File.exist?(destination_path)
+            FileUtils.cp_r(origin_framework_path, destination_path)
+            return xcframework_path
           end
         end
 
@@ -153,7 +155,7 @@ module KZ
       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}")
+        KZLog.run_shell("lipo #{arm64_framework_exe_path} -thin arm64 -output #{arm64_framework_exe_path}")
       end
 
       simulator_path = tempdir + "simulator"
@@ -163,13 +165,15 @@ module KZ
       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}")
+        KZLog.run_shell("lipo #{simulator_framework_exe_path} -thin x86_64 -output #{simulator_framework_exe_path}")
       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)
+        KZLog.log("'#{origin_framework_path.basename}' 是一个动态库，开始做Load command转换")
+
         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"
@@ -192,35 +196,51 @@ module KZ
             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}")
+        xcrun_vtool_set_result = KZLog.run_shell("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
+          KZLog.log("'#{origin_framework_path.basename}' Load command转换转换失败", :warning)
           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
-          Dir["#{ar_x_path}/*.o"].each do |file|
-            system(ARM64_TO_SIMULATOR_EXECUTE_PATH, file)
+        if self.is_current_ar_archive?(origin_framework_path + framework_basename)
+          KZLog.log("'#{origin_framework_path.basename}' 是一个ar archive类型静态库，开始拆分.o并重新构建")
+
+          ar_x_success = KZLog.run_shell("cd #{ar_x_path}; ar x #{arm64_framework_exe_path}")
+          if ar_x_success
+            Dir["#{ar_x_path}/*.o"].each do |file|
+              status = KZLog.run_shell("#{ARM64_TO_SIMULATOR_EXECUTE_PATH} '#{file}'")
+              unless status
+                KZLog.log("'#{file}' 存在.o转换失败", :warning)
+                FileUtils.rm_r(tempdir)
+                return false
+              end
+            end
+            KZLog.run_shell("ar crv #{temp_framwork_exe_path} #{ar_x_path}/*.o")
+          else
+            KZLog.log("'#{origin_framework_path.basename}' ar拆分失败", :warning)
+            FileUtils.rm_r(tempdir)
+            return false
           end
-          system("ar crv #{temp_framwork_exe_path} #{ar_x_path}/*.o &> /dev/null")
         else
+          KZLog.log("'#{origin_framework_path.basename}' 是一个不支持转换的格式，arm64 simulator转换失败", :warning)
+
           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}")
+        KZLog.run_shell("lipo -create #{temp_framwork_exe_path} #{simulator_framework_exe_path} -output #{simulator_framework_exe_path}")
       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}")
+      KZLog.run_shell("xcodebuild -create-xcframework -framework $(readlink -f '#{arm64_framework_path}') -framework $(readlink -f '#{simulator_framework_path}') -output #{destination_xcframework_path}")
       FileUtils.rm_r(tempdir)
-
+      KZLog.log("'#{origin_framework_path.basename}'xcframework创建成功", :success)
       return true
     end
 
@@ -229,6 +249,11 @@ module KZ
       return file_result.include?("dynamically linked shared library")
     end
 
+    def self.is_current_ar_archive?(file_path)
+      file_result = `file -b #{file_path}`
+      return file_result.include?("current ar archive")
+    end
+
     def self.contain_x8664?(file_path)
       file_result = `file -b #{file_path}`
       return file_result.include?("for architecture x86_64")

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

@@ -11,13 +11,15 @@ module KZ
       @main_project = main_project
     end
 
-    def add_framework_generator_build_phase(native_target)
+    def add_framework_generator_build_phase(native_target, input_paths)
       return if KZ::KZGlobalHelper.instance.disable_generate_framework
 
       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}/${PRODUCT_NAME}.xcframework']
-      build_phase.shell_script = KZ.deal_path_for_xcconfig(KZ_GENERATOR_FRAMEWORK_PATH, true)
+      build_phase.shell_path = '/bin/zsh'
+      build_phase.input_paths = Array[input_paths]
+      build_phase.output_paths = Array['${KZ_FRAMEWORK_CACHE_PATH}/${PRODUCT_NAME}.xcframework']
+      build_phase.shell_script = KZ.deal_path_for_xcconfig(KZ_GENERATE_FRAMEWORK_PATH, true)
     end
 
     def add_flexlib_xml_build_rules(project, native_target)
@@ -32,22 +34,26 @@ module KZ
       xml_rule = new_build_rule(project, native_target, '[KZ] Custom Xml Build')
       xml_rule.run_once_per_architecture = '0'
       xml_rule.file_type = 'text.xml'
+      xml_rule.input_files = Array['${INPUT_FILE_PATH}']
       xml_rule.output_files = Array['${KZ_XML_FLEX_DIR}/${INPUT_FILE_BASE}.flex']
       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)
+    def add_force_load_exe_path_build_phase(native_target, input_path, output_path)
       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_path = '/bin/zsh'
+      build_phase.input_paths = Array[input_path]
+      build_phase.output_paths = Array[output_path]
       build_phase.shell_script = KZ.deal_path_for_xcconfig(KZ_FIX_FORCE_LOAD_EXE, true)
     end
 
-    def add_improve_yaml_build_phase(project, native_target, output_path)
+    def add_improve_yaml_build_phase(project, native_target, input_path, output_path)
       build_phase = new_shell_script_build_phase(project, native_target, '[KZ] Improve Custom Yaml', true)
       build_phase.show_env_vars_in_log = '0'
-      # build_phase.always_out_of_date = '1'
-      build_phase.output_paths = [output_path]
+      build_phase.shell_path = '/bin/zsh'
+      build_phase.input_paths = Array[input_path]
+      build_phase.output_paths = Array[output_path]
       build_phase.shell_script = KZ.deal_path_for_xcconfig(KZ_IMPROVE_CUSTOM_YAML_PATH, true)
     end
 
@@ -141,6 +147,8 @@ module KZ
 
           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"
+
+          KZLog.log("修复'#{kz_pod_target.name}'头文件导入", :success)
         end
 
         # 添加私有头文件引用
@@ -166,6 +174,8 @@ module KZ
           end
         end
       end
+
+      KZLog.log("完成所有hmap&yaml配置", :success)
     end
 
     def traverse_folder(folder_path)
@@ -331,7 +341,8 @@ module KZ
       json_file.syswrite(hmap_json)
       json_file.close
 
-      system "#{HMAP_EXECUTE_PATH} convert #{hmap_json_path} #{hmap_path}"
+      KZLog.run_shell("#{HMAP_EXECUTE_PATH} convert #{hmap_json_path} #{hmap_path}")
+      KZLog.log("'#{file_name}.hamp'生成失败", :error) unless File.exist?(hmap_path)
 
       FileUtils.rm(hmap_json_path) unless KZ::KZGlobalHelper.instance.debug
     end

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

@@ -10,11 +10,13 @@ module KZ
 
       # 汇总所有配置文件，用于代码中加载资源
       on_demand_resources_all_config = {}
+      # 用于记录tag防止重复
+      current_all_tags = {}
       @all_kz_pod_targets.each do |target_name, kz_pod_target|
         on_demand_resources_info = kz_pod_target.on_demand_resources_info
         next if on_demand_resources_info.empty?
 
-        analyze_on_demand_resources_config_plist(on_demand_resources_info, kz_pod_target)
+        analyze_on_demand_resources_config_plist(on_demand_resources_info, kz_pod_target, current_all_tags)
         new_on_demand_resources_info = on_demand_resources_info.transform_values do |inner_hash|
           inner_hash.transform_values do |paths|
             paths.map { |path| File.basename(path) }
@@ -26,7 +28,11 @@ module KZ
       # 将汇总的配置写入app中，供代码读取
       if on_demand_resources_all_config.size > 0
         write_to_path(on_demand_resources_all_config, kz_on_demand_resources_all_config_path)
+      else
+        KZLog.log("KZOnDemandResourcesAllConfig.plist内容为空，创建失败", :warning)
       end
+
+      KZLog.log("完成所有ODR配置", :success)
     end
 
     def get_all_xcassets(kz_pod_target)
@@ -43,7 +49,7 @@ module KZ
       all_xcassets_paths
     end
 
-    def analyze_on_demand_resources_config_plist(plist_hash, kz_pod_target)
+    def analyze_on_demand_resources_config_plist(plist_hash, kz_pod_target, current_all_tags)
       resources_path = kz_pod_target.pod_config_cache_path(false, false, true)
       FileUtils.rm_r(resources_path) if File.exist?(resources_path)
       FileUtils.mkdir_p(resources_path)
@@ -64,7 +70,7 @@ module KZ
 
       # 从配置plist中读取'Initial Install Tags'资源
       initial_plist_hash = plist_hash["Initial Install Tags"]
-      on_demand_resources_from_plist(initial_plist_hash, kz_pod_target, 1, resources_path, odr_build_info) do |tag, bundle_id, bundle_path, normal_file_names, have_xcassets_paths|
+      on_demand_resources_from_plist(initial_plist_hash, kz_pod_target, 1, resources_path, odr_build_info, current_all_tags) do |tag, bundle_id, bundle_path, normal_file_names, have_xcassets_paths|
         # 如有配置中有.xcassets资源，需要先标记，等待编译时单独再单独编译
         if have_xcassets_paths
           resource_item = {}
@@ -76,11 +82,13 @@ module KZ
 
         bundle_resource_request_tags[tag] = { "NSAssetPacks" => [bundle_id] }
         bundle_resource_request_asset_packs[bundle_id] = normal_file_names if normal_file_names.size > 0
+
+        KZLog.log("已经完成'#{kz_pod_target.name}'中'#{tag}'ODR配置，资源id为：'#{bundle_id}'")
       end
 
       # Prefetched Tag Order
       prefetched_plist_hash = plist_hash["Prefetched Tag Order"]
-      on_demand_resources_from_plist(prefetched_plist_hash, kz_pod_target, 0.5, resources_path, odr_build_info) do |tag, bundle_id, bunlde_path, normal_file_names, have_xcassets_paths|
+      on_demand_resources_from_plist(prefetched_plist_hash, kz_pod_target, 0.5, resources_path, odr_build_info, current_all_tags) do |tag, bundle_id, bunlde_path, normal_file_names, have_xcassets_paths|
         if have_xcassets_paths
           resource_item = {}
           resource_item["bundle-id"] = bundle_id
@@ -91,11 +99,13 @@ module KZ
 
         bundle_resource_request_tags[tag] = { "NSAssetPacks" => [bundle_id] }
         bundle_resource_request_asset_packs[bundle_id] = normal_file_names if normal_file_names.size > 0
+
+        KZLog.log("已经完成'#{kz_pod_target.name}'中'#{tag}'ODR配置，资源id为：'#{bundle_id}'")
       end
 
       # Download Only On Demand
       download_plist_hash = plist_hash["Download Only On Demand"]
-      on_demand_resources_from_plist(download_plist_hash, kz_pod_target, 0, resources_path, odr_build_info) do |tag, bundle_id, bunlde_path, normal_file_names, have_xcassets_paths|
+      on_demand_resources_from_plist(download_plist_hash, kz_pod_target, 0, resources_path, odr_build_info, current_all_tags) do |tag, bundle_id, bunlde_path, normal_file_names, have_xcassets_paths|
         if have_xcassets_paths
           resource_item = {}
           resource_item["bundle-id"] = bundle_id
@@ -106,6 +116,8 @@ module KZ
 
         bundle_resource_request_tags[tag] = { "NSAssetPacks" => [bundle_id] }
         bundle_resource_request_asset_packs[bundle_id] = normal_file_names if normal_file_names.size > 0
+
+        KZLog.log("已经完成'#{kz_pod_target.name}'中'#{tag}'ODR配置，资源id为：'#{bundle_id}'")
       end
 
       if asset_pack_output_specifications_resources.size > 0
@@ -122,11 +134,18 @@ module KZ
       end
     end
 
-    def on_demand_resources_from_plist(plist_hash, kz_pod_target, priority, resources_path, odr_build_info)
+    def on_demand_resources_from_plist(plist_hash, kz_pod_target, priority, resources_path, odr_build_info, current_all_tags)
       return unless (!plist_hash.nil? && plist_hash.size > 0)
 
       all_normal_file_names = []
       plist_hash.each do |tag, file_paths|
+        if current_all_tags.key?(tag)
+          KZLog.log("#{kz_pod_target.name}与#{current_all_tags[tag]}中存在相同tag：#{tag}，#{kz_pod_target.name}中的tag将被废弃", :warning)
+          next
+        else
+          current_all_tags[tag] = kz_pod_target.name
+        end
+
         normal_file_names = []
         normal_file_paths = []
 
@@ -141,9 +160,15 @@ module KZ
               on_demand_resources_xcassets(kz_pod_target, odr_build_info, xcassets_path) do |tag_info|
                 tag_info[file_path.relative_path_from(xcassets_path)] = tag
               end
+            else
+              KZLog.log("资源'#{file_path}'不在xcassets文件夹中，将作为普通文件做ODR配置", :warning)
             end
           else
             # 普通文件配置
+            if File.directory?(file_path) && file_path.extname != "bundle"
+              KZLog.log("资源'#{file_path}'是一个非bundle的文件夹，将被废弃", :warning)
+              next
+            end
             normal_file_paths << file_path
             normal_file_names << file_path.basename
             all_normal_file_names << file_path.basename
@@ -201,7 +226,11 @@ module KZ
       FileUtils.mkdir_p(demand_bundle_folder) unless FileTest::exist?(demand_bundle_folder)
       # copy file
       normal_file_paths.each do |file|
-        FileUtils.cp(file, demand_bundle_folder)
+        if File.directory?(file)
+          FileUtils.cp_r(file, demand_bundle_folder)
+        else
+          FileUtils.cp(file, demand_bundle_folder)
+        end
       end
 
       bundle_info_plist = {}

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

@@ -11,13 +11,13 @@ module KZ
     attr_accessor :enable
     attr_accessor :config_plist_path_patterns
     attr_accessor :bundle_id
-    attr_accessor :odr_target_name
+    attr_accessor :odr_target_names
 
     def initialize
       @enable = false
       @config_plist_path_patterns = {}
       @bundle_id = ""
-      @odr_target_name = ""
+      @odr_target_names = []
     end
 
   end
@@ -34,7 +34,8 @@ module KZ
   HMAP_EXECUTE_PATH = File.dirname(__FILE__) + '/../resources/hmap'
   FLEX_COMPLIER_PATH = KZ_POD_CONFIG_SUPPORT_FILES + 'FlexCompiler'
   ARM64_TO_SIMULATOR_EXECUTE_PATH = File.dirname(__FILE__) + '/../resources/arm64ToSimulator'
-  KZ_GENERATOR_FRAMEWORK_PATH = KZ_POD_CONFIG_SUPPORT_FILES + 'kz_generator_framework.sh'
+  KZ_GENERATE_FRAMEWORK_PATH = KZ_POD_CONFIG_SUPPORT_FILES + 'kz_generate_framework.sh'
+  KZ_GENERATE_XCODE_ENV_PATH = File.dirname(__FILE__) + '/../resources/kz_generate_xcode_env.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'
@@ -68,7 +69,6 @@ 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
     attr_accessor :on_demand_resources_info
 
@@ -83,7 +83,6 @@ 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
       @on_demand_resources_info = KZOnDemandResourcesInfo.new
     end
@@ -103,6 +102,9 @@ module KZ
 
     def prepare
       if Pod::Config.instance.podfile && Pod::Config.instance.podfile.plugins.has_key?("cocoapods-kz")
+        @kz_pod_enable = true
+        @generate_kz_pod_targets = true
+
         if olde_lock_file_content == nil || olde_lock_file_content['version'] != KZ_POD_CONFIG_VERSION
           FileUtils.rm_rf(KZ_POD_CONFIG_ROOT)
           FileUtils.mkdir_p(KZ_POD_CONFIG_ROOT)
@@ -112,8 +114,8 @@ module KZ
         FileUtils.rm_rf(KZ_POD_CONFIG_POD_TEMPDIR) if File.exist?(KZ_POD_CONFIG_POD_TEMPDIR)
         FileUtils.mkdir_p(KZ_POD_CONFIG_POD_TEMPDIR)
 
-        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_generate_framework.sh', KZ_GENERATE_FRAMEWORK_PATH)
+        system("chmod +x #{KZ_GENERATE_FRAMEWORK_PATH}")
 
         FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/kz_xml_build.sh', KZ_XML_BUILD_PATH)
         system("chmod +x #{KZ_XML_BUILD_PATH}")
@@ -133,6 +135,7 @@ module KZ
           FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/on_demand_resources/', KZ_ON_DEMAND_RESOURCES)
           system("chmod +x #{KZ_ON_DEMAND_RESOURCES_SHELL}")
         end
+        KZLog.log("cocoapods-kz已启用，已完成环境配置", :success)
       else
         @kz_pod_enable = false
         @generate_kz_pod_targets = false
@@ -144,11 +147,14 @@ module KZ
       FileUtils.rm(FLEX_COMPLIER_PATH) if File.exist?(FLEX_COMPLIER_PATH)
       if flexlib_info.have_flexLib_pod
         if flexlib_info.flexLib_version.major >= 4
+          KZLog.log("当前使用Flexlib使用4.0及以上版本，xml解析器使用新版", :info)
           FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler_V1', FLEX_COMPLIER_PATH)
         else
+          KZLog.log("当前使用Flexlib使用4.0以下版本，xml解析器使用旧版", :info)
           FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler', FLEX_COMPLIER_PATH)
         end
       elsif flexlib_info.have_kzswiftui_pod
+        KZLog.log("当前使用KZSwiftUI，xml解析器使用新版", :info)
         FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler_V1', FLEX_COMPLIER_PATH)
       end
       system("chmod +x #{FLEX_COMPLIER_PATH}") if File.exist?(FLEX_COMPLIER_PATH)
@@ -213,6 +219,7 @@ module KZ
         File.open(KZ_LOCK_FILE_PATH, 'w') do |file|
           file.write(lock_file_content)
         end
+        KZLog.log("Lock File文件保存成功", :success)
       end
     end
 

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

@@ -1,11 +1,31 @@
+require 'open3'
+
 module KZ
 
   class KZLog
-    def self.log(logStr)
-      if KZGlobalHelper.instance.debug
-        puts logStr
+    @log_types = {
+      error:    "\e[31m",
+      success:  "\e[32m",
+      warning:  "\e[33m",
+      info:     "\e[34m",
+      reset:    "\e[0m",
+      normal:   ""
+    }
+
+    def self.log(log_string, type = :normal)
+      if KZGlobalHelper.instance.debug || type == :error || type == :warning
+        puts "\e[36m【Cocoapods-kz】\e[0m#{@log_types[type]}【#{type}】#{@log_types[:reset]}#{log_string}"
       end
     end
+
+    def self.run_shell(cmd)
+      stdout, stderr, status = Open3.capture3(cmd)
+
+      self.log(stdout) unless stdout.empty?
+      self.log(stderr, :error) unless stderr.empty?
+
+      return status.success?
+    end
   end
 end
 

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

@@ -114,19 +114,6 @@ module KZ
                           end
     end
 
-    # 重些config_pod_mode的set方法，kz_pod_framework_mode优先级最高
-    def config_pod_mode=(value)
-      return if value == :kz_pod_origin_mode
-
-      if @config_pod_mode != :kz_pod_framework_mode
-        @config_pod_mode = value
-      end
-
-      @dependent_target_info.values.each do |dependent_target|
-        dependent_target.config_pod_mode=(value) unless dependent_target.is_dev_pod
-      end
-    end
-
     # 重些config_pod_mode的get方法，force_config_pod_mode优先级最高
     def config_pod_mode
       return @force_config_pod_mode if @force_config_pod_mode != :kz_pod_origin_mode
@@ -213,7 +200,7 @@ module KZ
       if @use_local_private_headers_path
         header_search_paths += (' ' + KZ.deal_path_for_xcconfig(local_private_headers_path, true))
       end
-      header_search_paths += (' ' + KZ.deal_path_for_xcconfig(self.native_pod_target.sandbox.public_headers.root, true))
+      header_search_paths += (' ' + KZ.deal_path_for_xcconfig("${PODS_ROOT}/Headers/Public", true))
       custom_paths.each do |custom_path|
         header_search_paths += (' ' + custom_path)
       end if custom_paths
@@ -359,7 +346,13 @@ module KZ
 
       on_demand_resources_info = {}
       result.each do |config_plist_path|
-        plist_hash = Xcodeproj::Plist.read_from_path(config_plist_path)
+        begin
+          plist_hash = Xcodeproj::Plist.read_from_path(config_plist_path)
+        rescue => e
+          KZLog.log("'#{@name}'中ODR配置文件：'#{config_plist_path}'格式不正确，请参考文档使用正确的plist文件", :error)
+          next
+        end
+
         initial_plist_hash = plist_hash[Initial_Install_Tags]
         traversal_resource_for_tag(initial_plist_hash, path_list) do |tag_resources|
           on_demand_resources_info[Initial_Install_Tags] = tag_resources
@@ -388,6 +381,8 @@ module KZ
             valid_path = path_list.relative_path_in_snadbox?(resource_path)
             unless valid_path.nil?
               valid_paths.append(valid_path)
+            else
+              KZLog.log("'#{@name}'中ODR资源路径：'#{resource_path}'不存在，请示使用相对podspec文件的相对路径", :warning)
             end
           end
           if valid_paths.size > 0

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

@@ -6,9 +6,15 @@ module KZ
       @main_project = main_project
       @all_kz_pod_targets = KZ::KZGlobalHelper.instance.kz_analyzer.all_kz_pod_targets
       @specify_pod_names = KZ::KZGlobalHelper.instance.specify_pod_names
+      @header_white_list = %w[ifaddrs.h netdb.h resolv.h math.h Availability.h fcntl.h netdb.h unistd.h TargetConditionals.h]
     end
 
     def repair
+      if @all_kz_pod_targets.empty?
+        KZLog.log("项目pod分析失败，请检测配置后重试", :error)
+        return
+      end
+
       if @specify_pod_names.count == 0 || @specify_pod_names.include?("Main")
         main_project_file_folder = @main_project.project_dir + @main_project.root_object.display_name
         main_project_files = []
@@ -23,7 +29,7 @@ module KZ
             end
           end
         end
-        puts "Start reair main project..."
+        KZLog.log("Start reair main project...", :info)
         main_project_files.each do |file_path|
           repair_file(file_path, main_project_headers)
         end
@@ -44,7 +50,7 @@ module KZ
           end
         end
 
-        puts "Start reair '#{kz_pod_target.name}' files..."
+        KZLog.log("Start reair '#{kz_pod_target.name}' files...", :info)
         need_repair_files.each do |file_path|
           repair_file(file_path, kz_pod_target.all_headers, kz_pod_target.recursive_dependent_targets)
         end
@@ -58,8 +64,9 @@ module KZ
       contents = file.readlines
       file.close
 
+      previous_line = ""
       contents.each do |line|
-        if line =~ /#import\s*["<]([a-zA-Z\+]+\.h)[">]/
+        if !line.start_with?("//") && line =~ /#import\s*["<]([a-zA-Z\+]+\.h)[">]/
           heaer_name = $1
           other_module_name = find_other_module_name(heaer_name, current_module_headers, sub_pods)
           if other_module_name
@@ -69,12 +76,15 @@ module KZ
               new_header_content << "#import <#{other_module_name}/#{heaer_name}>\n"
             end
           else
-            new_header_content << "#warning '#{heaer_name}' is not included in the current pod or its subpods\n"
+            unless previous_line.end_with?("is not included in the current pod or its subpods\n") || @header_white_list.include?(heaer_name)
+              new_header_content << "#warning '#{heaer_name}' is not included in the current pod or its subpods\n"
+            end
             new_header_content << line
           end
         else
           new_header_content << line
         end
+        previous_line = line
       end
       write_swift_file(file_path, new_header_content)
     end

data/lib/cocoapods-kz/native/dls.rb

@@ -46,7 +46,7 @@ module Pod
             "target `#{name}`."
         end
         KZ::KZGlobalHelper.instance.on_demand_resources_info.enable = true
-        KZ::KZGlobalHelper.instance.on_demand_resources_info.odr_target_name = name
+        KZ::KZGlobalHelper.instance.on_demand_resources_info.odr_target_names.append(name)
 
         parent = current_target_definition
         definition = TargetDefinition.new(name, parent)

data/lib/cocoapods-kz/native/installer.rb

@@ -11,17 +11,28 @@ module Pod
 
       # 因为kz_pod_target提供不少方法，需要判断pod文件情况，所以依赖分析需要挪到download之后
       if KZ::KZGlobalHelper.instance.generate_kz_pod_targets
+        kz_analyer = KZ::KZAnalyzer.new(pod_targets, self.sandbox.development_pods)
+        kz_analyer.analyer
+        KZ::KZGlobalHelper.instance.kz_analyzer = kz_analyer
+      end
+
+      if KZ::KZGlobalHelper.instance.kz_pod_enable
         main_project = aggregate_targets.first.user_project
         main_project.targets.each do |main_target|
-          if main_target.display_name == KZ::KZGlobalHelper.instance.on_demand_resources_info.odr_target_name
+          if KZ::KZGlobalHelper.instance.on_demand_resources_info.odr_target_names.include?(main_target.display_name)
             bundle_id = main_target.build_configurations.first.kz_simple_attributes_buildSettings_hash["PRODUCT_BUNDLE_IDENTIFIER"]
-            KZ::KZGlobalHelper.instance.on_demand_resources_info.bundle_id = bundle_id unless bundle_id.nil?
+            unless bundle_id.nil?
+              if !KZ::KZGlobalHelper.instance.on_demand_resources_info.bundle_id.empty? && KZ::KZGlobalHelper.instance.on_demand_resources_info.bundle_id != bundle_id
+                KZ::KZLog.log("'#{main_target.display_name}'的bundleId：'#{bundle_id}'与其他odr target不同，ODR配置失败", :error)
+                exit
+              end
+              KZ::KZGlobalHelper.instance.on_demand_resources_info.bundle_id = bundle_id
+              KZ::KZLog.log("'#{main_target.display_name}'开启ODR，bundleId为: '#{bundle_id}'", :success)
+            else
+              KZ::KZLog.log("'#{main_target.display_name}'开启ODR失败，bundleId为空", :warning)
+            end
           end
         end
-
-        kz_analyer = KZ::KZAnalyzer.new(pod_targets, self.sandbox.development_pods)
-        kz_analyer.analyer
-        KZ::KZGlobalHelper.instance.kz_analyzer = kz_analyer
         KZ::KZGlobalHelper.instance.kz_generator = KZ::KZGenerator.new(main_project)
         KZ::KZGlobalHelper.instance.handle_flexCompiler
       end
@@ -48,9 +59,11 @@ module Pod
       if KZ::KZGlobalHelper.instance.kz_pod_enable
         KZ::KZGlobalHelper.instance.write_lock_file
 
+        KZ::KZLog.run_shell("sh '#{KZ::KZ_GENERATE_XCODE_ENV_PATH}' #{KZ::KZ_POD_CONFIG_ROOT + ".xcode_env.sh"}")
+
         current_pods_pbxproj_path = self.pods_project.path + 'project.pbxproj'
         temp_pods_pbxproj_path = KZ::KZ_POD_CONFIG_POD_TEMPDIR + 'project.pbxproj'
-        system("(sleep 1 && ruby '#{KZ::KZ_FEFRESH_PODS_PBXPROJ}' '#{current_pods_pbxproj_path}' '#{temp_pods_pbxproj_path}') &")
+        KZ::KZLog.run_shell("(sleep 1 && ruby '#{KZ::KZ_FEFRESH_PODS_PBXPROJ}' '#{current_pods_pbxproj_path}' '#{temp_pods_pbxproj_path}') &")
       end
     end
   end

data/lib/cocoapods-kz/native/pod_target_installer.rb

@@ -15,7 +15,8 @@ module Pod
 
               if self.target.should_build?
                 unless self.target.name.start_with?('Pods-')
-                  KZ::KZGlobalHelper.instance.kz_generator.add_framework_generator_build_phase(target_installation_result.native_target)
+                  input_path = "${PODS_CONFIGURATION_BUILD_DIR}/${TARGET_NAME}/${FULL_PRODUCT_NAME}/#{kz_pod_target.product_basename}"
+                  KZ::KZGlobalHelper.instance.kz_generator.add_framework_generator_build_phase(target_installation_result.native_target, input_path)
                 end
 
                 if kz_pod_target&.is_dev_pod
@@ -25,17 +26,22 @@ module Pod
 
               if kz_pod_target&.origin_should_build?
                 if kz_pod_target.force_load
-                  KZ::KZGlobalHelper.instance.kz_generator.add_force_load_exe_path_build_phase(target_installation_result.native_target, kz_pod_target.force_load_info)
+                  input_path = "${PODS_CONFIGURATION_BUILD_DIR}/${TARGET_NAME}/${FULL_PRODUCT_NAME}/#{kz_pod_target.product_basename}"
+                  output_path = kz_pod_target.force_load_info
+                  KZ::KZGlobalHelper.instance.kz_generator.add_force_load_exe_path_build_phase(target_installation_result.native_target, input_path, output_path)
                 end
 
                 unless kz_pod_target.custom_origin_yaml_path.nil?
-                  KZ::KZGlobalHelper.instance.kz_generator.add_improve_yaml_build_phase(self.project, target_installation_result.native_target, kz_pod_target.custom_yaml_path)
+                  input_path = KZ.deal_path_for_xcconfig(kz_pod_target.custom_origin_yaml_path)
+                  output_path = KZ.deal_path_for_xcconfig(kz_pod_target.custom_yaml_path)
+                  KZ::KZGlobalHelper.instance.kz_generator.add_improve_yaml_build_phase(self.project, target_installation_result.native_target, input_path, output_path)
                 end
               end
 
               if kz_pod_target && !kz_pod_target.use_modulemap
                 target_installation_result.native_target.build_configurations.each do |c|
                   c.build_settings['DEFINES_MODULE'] = 'NO'
+                  KZ::KZLog.log("'#{kz_pod_target.name}' [#{c.name}] 已经配置为不使用modulemap", :info)
                 end
               end
             end

data/lib/cocoapods-kz/native/target_installer_helper.rb

@@ -52,11 +52,12 @@ module Pod
                 kz_add_swift_lldb_ast_paths(xcconfig, swift_lldb_ast_paths)
                 xcconfig.attributes['HEADER_SEARCH_PATHS'] = main_hamp_search_path
                 xcconfig.attributes['USE_HEADERMAP'] = 'NO'
+                xcconfig.attributes["KZ_POD_CONFIG_ROOT"] = KZ::KZ_POD_CONFIG_ROOT_STR
                 if KZ::KZGlobalHelper.instance.arm64_simulator
                   xcconfig.attributes.delete("EXCLUDED_ARCHS[sdk=iphonesimulator*]")
                   xcconfig.attributes['VALID_ARCHS'] = 'arm64 arm64_32 x86_64'
                 end
-                if KZ::KZGlobalHelper.instance.on_demand_resources_info.odr_target_name == self.target.name.sub('Pods-', '')
+                if KZ::KZGlobalHelper.instance.on_demand_resources_info.odr_target_names.include?(self.target.name.sub('Pods-', ''))
                   xcconfig.attributes["ENABLE_ON_DEMAND_RESOURCES"] = "NO"
 
                   on_demadn_resources_paths = ""
@@ -64,7 +65,6 @@ module Pod
                     on_demadn_resources_paths += ((on_demadn_resources_paths.empty? ? ''  : ' ') + '"' + path + '"')
                   end
                   xcconfig.attributes["KZ_ON_DEMAND_RESOURCES_PATHS"] = on_demadn_resources_paths unless on_demadn_resources_paths.empty?
-                  xcconfig.attributes["KZ_POD_CONFIG_ROOT"] = KZ::KZ_POD_CONFIG_ROOT_STR
                 end
 
                 kz_update_xcconfig_file(xcconfig, path)
@@ -73,11 +73,24 @@ module Pod
             elsif generator.is_a?(Pod::Target::BuildSettings::PodTargetSettings)
               kz_pod_target = self.target.weakRef_kz_pod_target
               if kz_pod_target
+                xcconfig = generator.xcconfig
+
+                custom_paths = []
+                origin_header_search_paths = xcconfig.attributes['HEADER_SEARCH_PATHS'].split(" ")
+                unless origin_header_search_paths.nil? || origin_header_search_paths.empty?
+                  origin_header_search_paths.each do |origin_search_paht|
+                    if origin_search_paht.include?("PODS_XCFRAMEWORKS_BUILD_DIR")
+                      custom_paths.append(origin_search_paht)
+                    end
+                  end
+                end
+
                 pod_custom_header_search_paths = generator.pod_target_xcconfig_values_by_consumer_by_key["HEADER_SEARCH_PATHS"]
-                pod_custom_header_search_paths = pod_custom_header_search_paths.values if pod_custom_header_search_paths
+                unless pod_custom_header_search_paths.nil? || pod_custom_header_search_paths.values.empty?
+                  custom_paths.concat(pod_custom_header_search_paths.values)
+                end
 
-                xcconfig = generator.xcconfig
-                xcconfig.attributes['HEADER_SEARCH_PATHS'] = kz_pod_target.header_search_paths(pod_custom_header_search_paths)
+                xcconfig.attributes['HEADER_SEARCH_PATHS'] = kz_pod_target.header_search_paths(custom_paths)
                 xcconfig.attributes['USE_HEADERMAP'] = 'NO'
                 framework_cache_path = KZ.deal_path_for_xcconfig(kz_pod_target.pod_config_cache_path(true))
                 xcconfig.attributes['KZ_FRAMEWORK_CACHE_PATH'] = framework_cache_path
@@ -90,8 +103,8 @@ module Pod
                 end
 
                 unless kz_pod_target.custom_origin_yaml_path.nil?
-                  xcconfig.attributes['KZ_CUSTOM_ORIGIN_YAML_PATH'] = kz_pod_target.custom_origin_yaml_path
-                  xcconfig.attributes['KZ_CUSTOM_YAML_PATH'] = kz_pod_target.custom_yaml_path
+                  xcconfig.attributes['KZ_CUSTOM_ORIGIN_YAML_PATH'] = KZ.deal_path_for_xcconfig(kz_pod_target.custom_origin_yaml_path)
+                  xcconfig.attributes['KZ_CUSTOM_YAML_PATH'] = KZ.deal_path_for_xcconfig(kz_pod_target.custom_yaml_path)
 
                   other_cflags = xcconfig.attributes['OTHER_CFLAGS']
                   if other_cflags == nil

data/lib/cocoapods-kz/native/target_integrator.rb

@@ -14,9 +14,13 @@ module Pod
           phase_name = "[KZ] On Demand Resources Build"
           native_targets.each do |native_target|
             phase = TargetIntegrator.create_or_update_shell_script_build_phase(native_target, phase_name)
-            if native_target.name == KZ::KZGlobalHelper.instance.on_demand_resources_info.odr_target_name
+            if KZ::KZGlobalHelper.instance.on_demand_resources_info.odr_target_names.include?(native_target.name)
               native_target.build_phases.push(phase).uniq! unless native_target.build_phases.include?(phase)
-              phase.shell_script = KZ.deal_path_for_xcconfig(KZ::KZ_ON_DEMAND_RESOURCES_SHELL, true)
+              # Xcode会默认给脚本内容增加换行，为了避免频繁的git变动，这里主动加上\n
+              phase.shell_script = "#{KZ.deal_path_for_xcconfig(KZ::KZ_ON_DEMAND_RESOURCES_SHELL, true)}\n"
+              phase.shell_path = '/bin/zsh'
+              phase.input_paths = Array["#{KZ::KZ_POD_CONFIG_ROOT_STR}/KZOnDemandResourcesAllConfig.plist"]
+              phase.output_paths = Array['${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/KZOnDemandResourcesAllConfig.plist']
             else
               native_target.build_phases.delete(phase) if native_target.build_phases.include?(phase)
             end

data/lib/cocoapods-kz/resources/{kz_generator_framework.sh → kz_generate_framework.sh}

@@ -1,3 +1,5 @@
+#!/bin/zsh
+
 if [ "${MACH_O_TYPE}" != "staticlib" ]; then
     exit 0
 fi

data/lib/cocoapods-kz/resources/kz_generate_xcode_env.sh

@@ -0,0 +1,21 @@
+#!/bin/zsh
+
+OUTPUT_FILE=$1
+VARS=(
+  PATH
+  GEM_HOME
+  GEM_PATH
+  RUBYLIB
+  RUBYOPT
+  LANG
+  LC_ALL
+)
+for var in "${VARS[@]}"; do
+  val="${!var}"
+  if [ -n "$val" ]; then
+    # 使用 printf 安全转义引号
+    printf "export %s=\"%s\"\n" "$var" "$val" >> "$OUTPUT_FILE"
+  fi
+done
+
+echo "" >> "$OUTPUT_FILE"

data/lib/cocoapods-kz/resources/kz_improve_custom_yaml.sh

@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/bin/zsh
+
 set -e
 set -u
 set -o pipefail

data/lib/cocoapods-kz/resources/on_demand_resources/kz_on_demand_resources_process.rb

@@ -22,9 +22,6 @@ end
 kz_on_demand_resources_paths = ENV["KZ_ON_DEMAND_RESOURCES_PATHS"]
 target_build_dir = Pathname(ENV["TARGET_BUILD_DIR"])
 target_build_temp_dir = Pathname(ENV["TARGET_TEMP_DIR"])
-if ENV["ACTION"] == "install" && ENV["SKIP_INSTALL"] == "NO"
-  target_build_dir = Pathname(ENV["INSTALL_DIR"])
-end
 app_path = target_build_dir + ENV["UNLOCALIZED_RESOURCES_FOLDER_PATH"]
 
 # pod过程解析的odr内容路径，放在环境参数KZ_ON_DEMAND_RESOURCES_PATHS中，
@@ -41,6 +38,7 @@ FileUtils.mkdir_p(target_build_on_demand_resources_path) unless File.exist?(targ
 kz_on_demand_resources_all_config_plist_path = Pathname(ENV["KZ_POD_CONFIG_ROOT"]) + "KZOnDemandResourcesAllConfig.plist"
 return unless File.exist?(kz_on_demand_resources_all_config_plist_path)
 FileUtils.cp(kz_on_demand_resources_all_config_plist_path, app_path)
+puts "【KZ-ODR】KZOnDemandResourcesAllConfig.plist生成成功"
 
 # 用于在最终.app中生成所有odr信息的plist文件，固定名称为OnDemandResources.plist，系统会自动识别
 app_on_demand_resources_plist = {}
@@ -51,11 +49,16 @@ app_on_demand_resources_plist["NSBundleResourceRequestAssetPacks"] = bundle_reso
 
 # 遍历所有组件的odr信息，然后将需要的资源进行拷贝
 kz_on_demand_resources_info.each do |pod_name, kz_on_demand_resources_path|
+  puts "\n"
   kz_on_demand_resources_path = Pathname(kz_on_demand_resources_path)
   odr_build_info_plist_paht = kz_on_demand_resources_path + "odr_build_info.plist"
-  next unless File.exist?(odr_build_info_plist_paht)
+  unless File.exist?(odr_build_info_plist_paht)
+    puts "【KZ-ODR】'#{pod_name}' odr_build_info.plist文件不存在\n"
+    next
+  end
 
   odr_build_info = Xcodeproj::Plist.read_from_path(odr_build_info_plist_paht)
+  puts "【KZ-ODR】开始配置'#{pod_name}'资源"
 
   # 获取对应组件的bundle，如果没有需要创建，这里的bundle名称会与target名称相同
   pod_bundle_path = Pathname(app_path) + "#{pod_name}.bundle"
@@ -64,10 +67,13 @@ kz_on_demand_resources_info.each do |pod_name, kz_on_demand_resources_path|
   # 将预处理的OnDemandResources拷贝到Product的OnDemandResources中
   on_demand_resources_build_path = kz_on_demand_resources_path + "OnDemandResources"
   FileUtils.cp_r("#{on_demand_resources_build_path}/.", target_build_on_demand_resources_path)
+  puts "【KZ-ODR】完成所有'#{pod_name}'预备资源拷贝"
 
   # 将组件自己的OnDemandResources.plist拷贝到组件bundle中，这里bundle其实也是一种app，也需要OnDemandResources.plist，用于系统识别odr资源 
   bundle_on_demand_resources_plist_path = kz_on_demand_resources_path + "OnDemandResources.plist"
   FileUtils.cp(bundle_on_demand_resources_plist_path, pod_bundle_path + "OnDemandResources.plist")
+  puts "【KZ-ODR】完成'#{pod_name}' OnDemandResources.plist拷贝"
+
   # 读取组件的OnDemandResources.plist中的tag信息，用于最终.app中生成的OnDemandResources.plist
   bundle_on_demand_resources_plist = Xcodeproj::Plist.read_from_path(bundle_on_demand_resources_plist_path)
   bundle_resource_request_tags.update(bundle_on_demand_resources_plist["NSBundleResourceRequestTags"])
@@ -84,6 +90,7 @@ kz_on_demand_resources_info.each do |pod_name, kz_on_demand_resources_path|
   # 将pod install过程生成的AssetPackOutputSpecifications拷贝到编译临时目录，并修改AssetPackOutputSpecifications.plist中的路径
   kz_asset_pack_output_specifications_plist_path = kz_on_demand_resources_path + "AssetPackOutputSpecifications.plist"
   next unless File.exist?(kz_asset_pack_output_specifications_plist_path)
+
   # 在Xcode编译过程中，会在build目录下生成一个临时目录，用于存放AssetPackOutputSpecifications.plist（该文件在pod install过程中生成了模版，拷贝到这里会进行修改后才能使用）
   build_on_demand_resources_temp_path = target_build_temp_dir + pod_name + "KZOnDemandResources"
   FileUtils.mkdir_p(build_on_demand_resources_temp_path) unless File.exist?(build_on_demand_resources_temp_path)
@@ -99,6 +106,7 @@ kz_on_demand_resources_info.each do |pod_name, kz_on_demand_resources_path|
     end
   end
   write_to_path(asset_pack_output_specifications_plist, asset_pack_output_specifications_plist_path)
+  puts "【KZ-ODR】'#{pod_name}' AssetPackOutputSpecifications.plist中资源路径更新成功"
 
   # 处理xcasset资源编译，从odr_info中读取原始xcasset资源，为了不破坏原有资源，这里将原始资源拷贝到临时目录，并修改对应的odr信息，然后使用actool进行编译
   all_xcassets = odr_build_info["all_xcassets"]
@@ -141,15 +149,22 @@ kz_on_demand_resources_info.each do |pod_name, kz_on_demand_resources_path|
         "--compile", pod_bundle_path.to_s,
         *xcasset_files.map(&:to_s)
       ].compact
-      system(*actool_cmd)
+      status = system(*actool_cmd)
+      if status
+        puts "【KZ-ODR】'#{pod_name}' xcasset资源编译成功"
+      else
+        puts "【KZ-ODR】'#{pod_name}' xcasset资源编译失败"
+      end
     end
     FileUtils.rm_rf(temp_dir)
   end
+  puts "\n"
 end
 
 # OnDemandResources.plist放到.app中，用于系统读取odr资源
 app_on_demand_resources_plist_path = app_path + "OnDemandResources.plist"
 write_to_path(app_on_demand_resources_plist, app_on_demand_resources_plist_path)
+puts "【KZ-ODR】完成主工程 OnDemandResources.plist拷贝"
 
 # 生成AssetPackManifestTemplate.plist放到.app中，用于系统读取odr记载路径与信息（archive时，系统会使用此文件生成新的AssetPackManifest.plist）
 asset_pack_manifest_template_plist_path = app_path + "AssetPackManifestTemplate.plist"
@@ -191,4 +206,7 @@ end
 
 if manifest_template_resources.size > 0
   write_to_path(manifest_template_plist_hash, asset_pack_manifest_template_plist_path)
+  puts "【KZ-ODR】完成主工程 AssetPackManifestTemplate.plist配置，ODR配置成功"
+else
+  puts "【KZ-ODR】主工程 AssetPackManifestTemplate.plist创建失败，ODR配置成功"
 end

data/lib/cocoapods-kz/resources/on_demand_resources/kz_on_demand_resources_xocde.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/zsh
 
 set -e
 set -u
@@ -17,26 +17,11 @@ if [ -z "${KZ_ON_DEMAND_RESOURCES_PATHS+x}" ]; then
   exit 0
 fi
 
-case "${TARGETED_DEVICE_FAMILY:-}" in
-  1,2)
-    TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
-    ;;
-  1)
-    TARGET_DEVICE_ARGS="--target-device iphone"
-    ;;
-  2)
-    TARGET_DEVICE_ARGS="--target-device ipad"
-    ;;
-  3)
-    TARGET_DEVICE_ARGS="--target-device tv"
-    ;;
-  4)
-    TARGET_DEVICE_ARGS="--target-device watch"
-    ;;
-  *)
-    TARGET_DEVICE_ARGS="--target-device mac"
-    ;;
-esac
+if [ -z "${KZ_POD_CONFIG_ROOT+x}" ]; then
+  exit 0
+fi
+
+source "${KZ_POD_CONFIG_ROOT}/.xcode_env.sh"
 
 RUBY_PATH=""
 function find_ruby_path {
@@ -60,13 +45,13 @@ function find_ruby_path {
         done < $RESOURCE_PATH
 
         source $ON_DEMAND_RESOURCES_SHELL_ENV >/dev/null 2>&1
-        if (gem list | grep cocoapods >/dev/null) ; then
+        if gem list | grep -q cocoapods; then
             RUBY_PATH=$(which ruby)
         fi
     fi
 }
 
-if (gem list | grep cocoapods >/dev/null) ; then
+if gem list | grep -q cocoapods; then
     RUBY_PATH=$(which ruby)
 fi
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-kz
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - yixiong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-24 00:00:00.000000000 Z
+date: 2025-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,8 @@ files:
 - lib/cocoapods-kz/resources/arm64ToSimulator
 - lib/cocoapods-kz/resources/hmap
 - lib/cocoapods-kz/resources/kz_fix_force_load_exe.sh
-- lib/cocoapods-kz/resources/kz_generator_framework.sh
+- lib/cocoapods-kz/resources/kz_generate_framework.sh
+- lib/cocoapods-kz/resources/kz_generate_xcode_env.sh
 - lib/cocoapods-kz/resources/kz_improve_custom_yaml.sh
 - lib/cocoapods-kz/resources/kz_refresh_pods_pbxproj.rb
 - lib/cocoapods-kz/resources/kz_xml_build.sh