cocoapods-kz 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5dcadeaa76d480bc0a06c97d9f07fc514d4f6c6fa6e1321ea60546f9b425a5f
-  data.tar.gz: 01ab3e043531cbc9e29d6a73ddc15e63873245c7aa99c8a301ae79dc531f4914
+  metadata.gz: 772c4e4e048e8879e3a0e9a922b887c3206338c9ec397f8747b017891f47e51d
+  data.tar.gz: 995dfcee40ec45c2c6b23d43bc7d08a8e3c8e2c6570fc9d7881c76850b679014
 SHA512:
-  metadata.gz: e163e6c506505a9a1cf39ae263a5a40ccaf1ff8aae61d0ac808f1256106409ff7d5fd29de8c52abe9fb93666e42a6ad0db504a759eadb94b2781478a61aa83c9
-  data.tar.gz: f678b463d568835f87a1d5d490c8f5096651d94fe7123ce94ac26ea8eee3ea1bd9130e908b7e2c616811e26c804523ef5897b2c69306f8e0ca89160cd3159830
+  metadata.gz: 802feb2c0501d20a2cf5b18031ee8f029d8b234a28bb9c8e6b6fbf6a21ac27d429a90af7f26aadb6977fb4b76d9e9e75cb07e94b33b1acbd0d0eb969bf7e065b
+  data.tar.gz: 3b9c1b52b50bb27d1b5f2ae8d595cd427409c0fc0653a0781ae5ae394efdfa5d2642d1fe6d29f2e12ef9b92c6e08ce276201ab2843b777bb9b9dcacacc9899a6

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

@@ -11,8 +11,11 @@ module Pod
         DESC
 
         def initialize(argv)
-          KZ::KZGlobalHelper.instance.analyze_special_parameters(true, false, argv.arguments!)
-          KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
+          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
           super
         end
 

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

@@ -25,24 +25,31 @@ module Pod
           @repair_private_hmap = argv.flag?('private-hmap')
           banner! unless @repair_module_import || @repair_dynamic_swift || @repair_private_hmap
 
-          KZ::KZGlobalHelper.instance.analyze_special_parameters(true, false, argv.arguments!)
-          KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
+          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
 
           super
         end
 
         def run
-          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.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
           end
         end
       end

data/lib/cocoapods-kz/gem_version.rb

@@ -1,5 +1,5 @@
 module CocoapodsKz
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end
 
 module Pod

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

@@ -82,6 +82,12 @@ module KZ
         kz_pod_target = KZPodTarget.new(native_pod_target)
         is_dev_pod = @development_pods.include?(native_pod_target_name)
         kz_pod_target.is_dev_pod = is_dev_pod
+        if KZGlobalHelper.instance.on_demand_resources_info.enable
+          on_demand_resources_config_patterns = KZGlobalHelper.instance.on_demand_resources_info.config_plist_path_patterns[kz_pod_target.root_name]
+          unless on_demand_resources_config_patterns.nil?
+            kz_pod_target.on_demand_resources_config_patterns = on_demand_resources_config_patterns
+          end
+        end
         kz_pod_target.force_config_pod_mode = get_force_config_pod_mode(kz_pod_target)
         if config_pod_mode != :kz_pod_origin_mode && !is_dev_pod
           kz_pod_target.config_pod_mode = config_pod_mode

data/lib/cocoapods-kz/helpers/{kz_generator.rb → kz_generator_hmap.rb}

@@ -1,5 +1,6 @@
 require 'xcodeproj'
 require 'fileutils'
+require_relative 'kz_generator_on_demand_resources'
 
 module KZ
 
@@ -8,8 +9,6 @@ module KZ
     def initialize(main_project)
       @all_kz_pod_targets = KZGlobalHelper.instance.kz_analyzer.all_kz_pod_targets
       @main_project = main_project
-      @installation_root = Pod::Config.instance.installation_root
-      @on_demand_resources_folder = KZ_POD_CONFIG_ROOT + "OnDemandResources"
     end
 
     def add_framework_generator_build_phase(native_target)
@@ -346,224 +345,5 @@ module KZ
       json_file.close
     end
 
-    def create_on_demand_resources
-      # 清除历史配置
-      FileUtils.rm_r(@on_demand_resources_folder) if File.exist?(@on_demand_resources_folder)
-      FileUtils.mkdir_p(@on_demand_resources_folder)
-
-      # 汇总所有配置文件，用于代码中加载资源
-      on_demand_resources_all_config = {}
-      @all_kz_pod_targets.each do |target_name, kz_pod_target|
-        if kz_pod_target.is_dev_pod
-          # 寻找配置文件KZOnDemandResourcesConfig.plist
-          kz_pod_target.native_pod_target.file_accessors.each do |file_accessor|
-            file_accessor.resource_bundles.map do |bundle_name, paths|
-              paths.each do |path|
-                if path.basename.to_s == "KZOnDemandResourcesConfig.plist"
-                  plist_hash = Xcodeproj::Plist.read_from_path(path)
-                  if plist_hash.size > 0
-                    on_demand_resources_all_config[kz_pod_target.name] = plist_hash
-                    analyze_on_demand_resources_config_plist(plist_hash, kz_pod_target, paths)
-                    kz_pod_target.add_on_demand_resources(path)
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-
-      if on_demand_resources_all_config.size > 0
-        use_for_code_plist_path = @on_demand_resources_folder + "KZOnDemandResourcesAllConfig.plist"
-        Xcodeproj::Plist.write_to_path(on_demand_resources_all_config, use_for_code_plist_path)
-      end
-    end
-
-    def analyze_on_demand_resources_config_plist(plist_hash, kz_pod_target, all_resources_paths)
-      resources_path = @on_demand_resources_folder + "Bundles/#{kz_pod_target.name}"
-      FileUtils.mkdir_p(resources_path)
-
-      # 生成AssetPackOutputSpecifications.plist，用于Images.xcassets编译
-      asset_pack_output_specifications_resources = []
-
-      # 用于生成OnDemandResources.plist文件，放到main bundle中标记按需加载资源
-      on_demand_resources_plist = {}
-      bundle_resource_request_tags = {}
-      on_demand_resources_plist["NSBundleResourceRequestTags"] = bundle_resource_request_tags
-      bundle_resource_request_asset_packs = {}
-      on_demand_resources_plist["NSBundleResourceRequestAssetPacks"] = bundle_resource_request_asset_packs
-
-      # 统计所有的xcassets资源
-      have_config_xcassets = false
-
-      # 从配置plist中读取'Initial Install Tags'资源
-      initial_plist_hash = plist_hash["Initial Install Tags"]
-      on_deman_resources_from_plist(initial_plist_hash, kz_pod_target, 1, all_resources_paths, resources_path) do |tag, bundle_id, bundle_path, normal_file_names, have_xcassets_paths|
-        # 如有配置中有.xcassets资源，需要先标记，等待编译时单独再单独编译
-        if have_xcassets_paths
-          have_config_xcassets = true
-
-          resource_item = {}
-          resource_item["bundle-id"] = bundle_id
-          resource_item["bundle-path"] = bundle_path
-          resource_item["tags"] = [tag]
-          asset_pack_output_specifications_resources << resource_item
-        end
-
-        bundle_resource_request_tags[tag] = { "NSAssetPacks" => [bundle_id] }
-        bundle_resource_request_asset_packs[bundle_id] = normal_file_names if normal_file_names.size > 0
-      end
-
-      # Prefetched Tag Order
-      prefetched_plist_hash = plist_hash["Prefetched Tag Order"]
-      on_deman_resources_from_plist(prefetched_plist_hash, kz_pod_target, 0.5, all_resources_paths, resources_path) do |tag, bundle_id, bunlde_path, normal_file_names, have_xcassets_paths|
-        if have_xcassets_paths
-          have_config_xcassets = true
-
-          resource_item = {}
-          resource_item["bundle-id"] = bundle_id
-          resource_item["bundle-path"] = bunlde_path
-          resource_item["tags"] = [tag]
-          asset_pack_output_specifications_resources << resource_item
-        end
-
-        bundle_resource_request_tags[tag] = { "NSAssetPacks" => [bundle_id] }
-        bundle_resource_request_asset_packs[bundle_id] = normal_file_names if normal_file_names.size > 0
-      end
-
-      # Download Only On Demand
-      download_plist_hash = plist_hash["Download Only On Demand"]
-      on_deman_resources_from_plist(download_plist_hash, kz_pod_target, 0, all_resources_paths, resources_path) do |tag, bundle_id, bunlde_path, normal_file_names, have_xcassets_paths|
-        if have_xcassets_paths
-          have_config_xcassets = true
-
-          resource_item = {}
-          resource_item["bundle-id"] = bundle_id
-          resource_item["bundle-path"] = bunlde_path
-          resource_item["tags"] = [tag]
-          asset_pack_output_specifications_resources << resource_item
-        end
-
-        bundle_resource_request_tags[tag] = { "NSAssetPacks" => [bundle_id] }
-        bundle_resource_request_asset_packs[bundle_id] = normal_file_names if normal_file_names.size > 0
-      end
-
-      if asset_pack_output_specifications_resources.size > 0
-        write_to_path(asset_pack_output_specifications_resources, resources_path + "AssetPackOutputSpecifications.plist")
-      end
-
-      if bundle_resource_request_tags.size > 0 || bundle_resource_request_asset_packs.size > 0
-        Xcodeproj::Plist.write_to_path(on_demand_resources_plist, resources_path + "OnDemandResources.plist")
-      end
-
-      # 一个组件可能有多个xcassets，只要其中一个有配置on demand resources，所有xcassets都需要单独编译
-      all_xcassets_paths = []
-      if have_config_xcassets
-        all_resources_paths.each do |path|
-          if path.extname == ".xcassets"
-            all_xcassets_paths << path
-          end
-        end
-      end
-
-      target_bundle_info = {}
-      target_bundle_info["name"] = kz_pod_target.name
-      target_bundle_info["xcassets_paths"] = all_xcassets_paths
-      Xcodeproj::Plist.write_to_path(target_bundle_info, resources_path + "TargetBundleInfo.plist")
-
-    end
-
-    def on_deman_resources_from_plist(plist_hash, kz_pod_target, priority, all_resources_paths, resources_path)
-      return unless (!plist_hash.nil? && plist_hash.size > 0)
-
-      plist_hash.each do |tag, file_paths|
-        normal_file_names = []
-        normal_file_paths = []
-        have_xcassets_paths = false
-        file_paths.each do |rel_file_path|
-          file_path = @installation_root + rel_file_path.strip
-          next unless file_path.exist?
-
-          if file_path.extname == ".imageset"
-            # imageset文件配置
-            xcassets_path = find_xcassets_path(file_path)
-            if all_resources_paths.include?(xcassets_path)
-              kz_pod_target.add_on_demand_resources(xcassets_path)
-              have_xcassets_paths = true
-            end
-
-            content_json_path = file_path + "Contents.json"
-            content_json = JSON.parse(File.read(file_path + "Contents.json"))
-            content_json["properties"] = { "on-demand-resource-tags" => [tag] }
-            content_json_file = File.new(content_json_path, 'w')
-            content_json_file.syswrite(JSON.pretty_generate(content_json))
-          else
-            # 普通文件配置
-            if all_resources_paths.include?(file_path)
-              kz_pod_target.add_on_demand_resources(file_path)
-              normal_file_paths << file_path
-              normal_file_names << file_path.basename
-            end
-          end
-        end
-
-        create_bundle_info_plist(tag, priority, normal_file_paths, resources_path) do |bundle_id, bundle_path|
-          yield(tag, bundle_id, bundle_path, normal_file_names, have_xcassets_paths)
-        end
-      end
-    end
-
-    def find_xcassets_path(path)
-      return "" if path.root?
-
-      if path.extname == ".xcassets"
-        path
-      else
-        find_xcassets_path(path + "..")
-      end
-    end
-
-    def create_bundle_info_plist(tag, priority, normal_file_paths, resource_path)
-      # project bundle identifier
-      project_bundle_identifier = KZGlobalHelper.instance.on_demand_resources_bundle_id
-      tag_md5 = md5_sign(tag)
-      # bundle folder
-      demand_bundle_folder_name = "#{project_bundle_identifier}.#{tag}-#{tag_md5}.assetpack"
-      demand_bundle_folder = resource_path + "OnDemandResources/#{demand_bundle_folder_name}"
-      # create bundle folder
-      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)
-      end
-
-      bundle_info_plist = {}
-      bundle_info_plist["Priority"] = priority if priority > 0
-      bundle_info_plist["Tags"] = [tag]
-      demand_bundle_id = "#{project_bundle_identifier}.asset-pack-#{tag_md5}"
-      bundle_info_plist["CFBundleIdentifier"] = demand_bundle_id
-      Xcodeproj::Plist.write_to_path(bundle_info_plist, demand_bundle_folder + "Info.plist")
-
-      yield(demand_bundle_id, demand_bundle_folder_name)
-    end
-
-    def md5_sign(key)
-      OpenSSL::Digest::MD5.hexdigest(key)
-    end
-
-    # Xcodeproj::Plist.write_to_path只支持hash，如果是数组需要重写write方法
-    def write_to_path(hash, path)
-      unless path.is_a?(String) || path.is_a?(Pathname)
-        raise TypeError, "The given `#{path}` must be a string or 'pathname'."
-      end
-      path = path.to_s
-      raise IOError, 'Empty path.' if path.empty?
-
-      File.open(path, 'w') do |f|
-        plist = Nanaimo::Plist.new(hash, :xml)
-        Nanaimo::Writer::XMLWriter.new(plist, :pretty => true, :output => f, :strict => false).write
-      end
-    end
-
   end
-end
+end

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

@@ -0,0 +1,231 @@
+require 'xcodeproj'
+require 'fileutils'
+
+module KZ
+  class KZGenerator
+
+    def create_on_demand_resources
+      kz_on_demand_resources_all_config_path = KZ_POD_CONFIG_ROOT + "KZOnDemandResourcesAllConfig.plist"
+      FileUtils.rm(kz_on_demand_resources_all_config_path) if File.exist?(kz_on_demand_resources_all_config_path)
+
+      # 汇总所有配置文件，用于代码中加载资源
+      on_demand_resources_all_config = {}
+      @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)
+        on_demand_resources_all_config[target_name] = on_demand_resources_info
+      end
+
+      # 将汇总的配置写入app中，供代码读取
+      if on_demand_resources_all_config.size > 0
+        write_to_path(on_demand_resources_all_config, kz_on_demand_resources_all_config_path)
+      end
+    end
+
+    def get_all_xcassets(kz_pod_target)
+      all_xcassets_paths = []
+      kz_pod_target.native_pod_target.file_accessors.each do |file_accessor|
+        file_accessor.resource_bundles.map do |bundle_name, paths|
+          paths.each do |path|
+            if path.extname == ".xcassets"
+              all_xcassets_paths << path
+            end
+          end
+        end
+      end
+      all_xcassets_paths
+    end
+
+    def analyze_on_demand_resources_config_plist(plist_hash, kz_pod_target)
+      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)
+      kz_pod_target.on_demand_resources_config_path = resources_path.to_s
+
+      # 生成AssetPackOutputSpecifications.plist，用于Images.xcassets编译
+      asset_pack_output_specifications_resources = []
+
+      # 用于生成OnDemandResources.plist文件，放到main bundle中标记按需加载资源
+      on_demand_resources_plist = {}
+      bundle_resource_request_tags = {}
+      on_demand_resources_plist["NSBundleResourceRequestTags"] = bundle_resource_request_tags
+      bundle_resource_request_asset_packs = {}
+      on_demand_resources_plist["NSBundleResourceRequestAssetPacks"] = bundle_resource_request_asset_packs
+
+      # 用于odr资源编译时读取所需的参数
+      odr_build_info = {}
+
+      # 从配置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|
+        # 如有配置中有.xcassets资源，需要先标记，等待编译时单独再单独编译
+        if have_xcassets_paths
+          resource_item = {}
+          resource_item["bundle-id"] = bundle_id
+          resource_item["bundle-path"] = bundle_path
+          resource_item["tags"] = [tag]
+          asset_pack_output_specifications_resources << resource_item
+        end
+
+        bundle_resource_request_tags[tag] = { "NSAssetPacks" => [bundle_id] }
+        bundle_resource_request_asset_packs[bundle_id] = normal_file_names if normal_file_names.size > 0
+      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|
+        if have_xcassets_paths
+          resource_item = {}
+          resource_item["bundle-id"] = bundle_id
+          resource_item["bundle-path"] = bunlde_path
+          resource_item["tags"] = [tag]
+          asset_pack_output_specifications_resources << resource_item
+        end
+
+        bundle_resource_request_tags[tag] = { "NSAssetPacks" => [bundle_id] }
+        bundle_resource_request_asset_packs[bundle_id] = normal_file_names if normal_file_names.size > 0
+      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|
+        if have_xcassets_paths
+          resource_item = {}
+          resource_item["bundle-id"] = bundle_id
+          resource_item["bundle-path"] = bunlde_path
+          resource_item["tags"] = [tag]
+          asset_pack_output_specifications_resources << resource_item
+        end
+
+        bundle_resource_request_tags[tag] = { "NSAssetPacks" => [bundle_id] }
+        bundle_resource_request_asset_packs[bundle_id] = normal_file_names if normal_file_names.size > 0
+      end
+
+      if asset_pack_output_specifications_resources.size > 0
+        write_to_path(asset_pack_output_specifications_resources, resources_path + "AssetPackOutputSpecifications.plist")
+      end
+
+      if bundle_resource_request_tags.size > 0 || bundle_resource_request_asset_packs.size > 0
+        write_to_path(on_demand_resources_plist, resources_path + "OnDemandResources.plist")
+      end
+
+      unless odr_build_info.empty?
+        all_xcassets_dest_plist_path = kz_pod_target.pod_config_cache_path(false, false, true) + "odr_build_info.plist"
+        write_to_path(odr_build_info, all_xcassets_dest_plist_path)
+      end
+    end
+
+    def on_demand_resources_from_plist(plist_hash, kz_pod_target, priority, resources_path, odr_build_info)
+      return unless (!plist_hash.nil? && plist_hash.size > 0)
+
+      all_normal_file_names = []
+      plist_hash.each do |tag, file_paths|
+        normal_file_names = []
+        normal_file_paths = []
+
+        have_xcassets_paths = false
+        file_paths.each do |file_path|
+          next unless file_path.exist?
+
+          if file_path.extname == ".imageset"
+            have_xcassets_paths = true
+            xcassets_path = find_xcassets_path(file_path)
+            unless xcassets_path.nil?
+              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
+            end
+          else
+            # 普通文件配置
+            normal_file_paths << file_path
+            normal_file_names << file_path.basename
+            all_normal_file_names << file_path.basename
+          end
+        end
+
+        create_bundle_info_plist(tag, priority, normal_file_paths, resources_path) do |bundle_id, bundle_path|
+          yield(tag, bundle_id, bundle_path, normal_file_names, have_xcassets_paths)
+        end
+      end
+
+      unless all_normal_file_names.empty?
+        odr_build_info["normal_files"] ||= []
+        odr_normal_files = odr_build_info["normal_files"]
+        odr_normal_files.concat(all_normal_file_names)
+      end
+    end
+
+    def find_xcassets_path(path)
+      return nil if path.root?
+
+      if path.extname == ".xcassets"
+        path
+      else
+        find_xcassets_path(path.parent)
+      end
+    end
+
+    def on_demand_resources_xcassets(kz_pod_target, odr_build_info, xcassets_path)
+      if odr_build_info["all_xcassets"].nil?
+        all_xcassets_info = {}
+        all_xcassets_paths = kz_pod_target.all_xcassets_paths
+        all_xcassets_paths.each do |path|
+          all_xcassets_info[path.basename.to_s] = { "path" => path.to_s, "tags" => {} }
+        end
+        odr_build_info["all_xcassets"] = all_xcassets_info
+      end
+      all_xcassets_info = odr_build_info["all_xcassets"]
+      xcassets_name = xcassets_path.basename.to_s
+      xcassets_info = all_xcassets_info[xcassets_name]
+      if xcassets_info.nil?
+        all_xcassets_info[xcassets_name] = { "path" => xcassets_path.to_s, "tags" => {} }
+      end
+      yield(all_xcassets_info[xcassets_name]["tags"])
+    end
+
+    def create_bundle_info_plist(tag, priority, normal_file_paths, resource_path)
+      # project bundle identifier
+      project_bundle_identifier = KZGlobalHelper.instance.on_demand_resources_info.bundle_id
+      tag_md5 = md5_sign(tag)
+      # bundle folder
+      demand_bundle_folder_name = "#{project_bundle_identifier}.#{tag}-#{tag_md5}.assetpack"
+      demand_bundle_folder = resource_path + "OnDemandResources/#{demand_bundle_folder_name}"
+      # create bundle folder
+      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)
+      end
+
+      bundle_info_plist = {}
+      bundle_info_plist["Priority"] = priority if priority > 0
+      bundle_info_plist["Tags"] = [tag]
+      demand_bundle_id = "#{project_bundle_identifier}.asset-pack-#{tag_md5}"
+      bundle_info_plist["CFBundleIdentifier"] = demand_bundle_id
+      Xcodeproj::Plist.write_to_path(bundle_info_plist, demand_bundle_folder + "Info.plist")
+
+      yield(demand_bundle_id, demand_bundle_folder_name)
+    end
+
+    def md5_sign(key)
+      OpenSSL::Digest::MD5.hexdigest(key)
+    end
+
+    # Xcodeproj::Plist.write_to_path只支持hash，如果是数组需要重写write方法
+    def write_to_path(hash, path)
+      unless path.is_a?(String) || path.is_a?(Pathname)
+        raise TypeError, "The given `#{path}` must be a string or 'pathname'."
+      end
+      path = path.to_s
+      raise IOError, 'Empty path.' if path.empty?
+
+      File.open(path, 'w') do |f|
+        plist = Nanaimo::Plist.new(hash, :xml)
+        Nanaimo::Writer::XMLWriter.new(plist, :pretty => true, :output => f, :strict => false).write
+      end
+    end
+
+  end
+end

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

@@ -7,6 +7,21 @@ require_relative 'kz_config_result'
 require_relative 'kz_pod_target'
 
 module KZ
+  class KZOnDemandResourcesInfo
+    attr_accessor :enable
+    attr_accessor :config_plist_path_patterns
+    attr_accessor :bundle_id
+    attr_accessor :odr_target_name
+
+    def initialize
+      @enable = false
+      @config_plist_path_patterns = {}
+      @bundle_id = ""
+      @odr_target_name = ""
+    end
+
+  end
+
   KZ_POD_CONFIG_VERSION = '1.0.2'
   KZ_POD_CONFIG_ROOT = Pod::Config.instance.installation_root + 'Pods/KZPodConfigure'
   KZ_POD_CONFIG_SUPPORT_FILES = KZ_POD_CONFIG_ROOT + 'SupportFiles'
@@ -55,7 +70,7 @@ module KZ
     attr_accessor :generate_kz_pod_targets
     attr_accessor :debug_shell_log_tag
     attr_accessor :arm64_simulator
-    attr_accessor :on_demand_resources_bundle_id
+    attr_accessor :on_demand_resources_info
 
     private_class_method :new
 
@@ -70,6 +85,7 @@ module KZ
       @olde_lock_file_content = nil
       @debug_shell_log_tag = "&> /dev/null"
       @arm64_simulator = false
+      @on_demand_resources_info = KZOnDemandResourcesInfo.new
     end
 
     def debug=(value)
@@ -112,8 +128,8 @@ module KZ
 
         Pod::Config.instance.podfile.use_frameworks!(:linkage => :static)
 
-        if !@on_demand_resources_bundle_id.nil?
-          FileUtils.rm_r(KZ_ON_DEMAND_RESOURCES) if File.exist?(KZ_ON_DEMAND_RESOURCES)
+        FileUtils.rm_r(KZ_ON_DEMAND_RESOURCES) if File.exist?(KZ_ON_DEMAND_RESOURCES)
+        if on_demand_resources_info.enable
           FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/on_demand_resources/', KZ_ON_DEMAND_RESOURCES)
           system("chmod +x #{KZ_ON_DEMAND_RESOURCES_SHELL}")
         end
@@ -124,15 +140,18 @@ module KZ
     end
 
     def handle_flexCompiler
-      if have_flexLib_pod_target
-        FileUtils.rm(FLEX_COMPLIER_PATH) if File.exist?(FLEX_COMPLIER_PATH)
-        if @kz_analyzer.pod_of_flexlib_info.flexLib_version.major >= 4
+      flexlib_info = @kz_analyzer.pod_of_flexlib_info
+      FileUtils.rm(FLEX_COMPLIER_PATH) if File.exist?(FLEX_COMPLIER_PATH)
+      if flexlib_info.have_flexLib_pod
+        if flexlib_info.flexLib_version.major >= 4
           FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler_V1', FLEX_COMPLIER_PATH)
         else
           FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler', FLEX_COMPLIER_PATH)
         end
-        system("chmod +x #{FLEX_COMPLIER_PATH}")
+      elsif flexlib_info.have_kzswiftui_pod
+        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)
     end
 
     def analyze_special_parameters(use_code_tag, use_framework_tag, pod_names)