cocoapods-kz 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cd6c7deb2a958e5306602d1e1010400b44643a642a27333be9fa8d93405c38f
-  data.tar.gz: 813cf28a218e20fb79a15e284c69dafee039949c2c9c21e4f7467f8350215ade
+  metadata.gz: 9f2ecfbcbc07e3ac505466898ae1b82fe6daf936bcfc56d7a128c7256a000888
+  data.tar.gz: '07248a9d57a52e6f2948b2d893d7463d8581f90d4bf29104df5d3465f991355c'
 SHA512:
-  metadata.gz: 61cd3bff4c6e8d50118395abaf1ebcff6e89f6ca9f64d98b636617e62c0c5bb5d8b3d7b5646e4496230d11da36d4a7bf4d9e5f8dec585107b06f3b7ba22d76b4
-  data.tar.gz: 7e47fda547a29835c34f4c761ff9d521aa26bd12f4e19bb37902f7e19751fe970e3b0dd0816204c12bf94d5d5fbca699da35576598ef5ce28bed2fe69e24acaf
+  metadata.gz: b32004addf7c59b259281c83d92fab22dc85d5e7f021992f9a3a86af996d8c3de764885fc6bf8b44b2094716743d9cb45133398f4468733c95def92fba911886
+  data.tar.gz: 4552647daba1c5c5265bc67302e84788a17bed18d6d87c93e70f90c6d3e97d393c342f6109f1f2f43e3a82ad3ab7071168e39df64b4b9ab35f9b3a308d6a06a8

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

@@ -29,7 +29,7 @@ module Pod
         def initialize(argv)
           use_code_tag = argv.flag?('code')
           use_framework_tag = argv.flag?('framework')
-          banner! if use_code_tag && use_framework_tag
+          banner! if (use_code_tag && use_framework_tag) || (!use_code_tag && !use_framework_tag && !argv.empty?)
 
           KZ::KZGlobalHelper.instance.analyze_special_parameters(use_code_tag, use_framework_tag, argv.arguments!)
           if Pod.match_version?('~> 1.11')

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

@@ -29,7 +29,7 @@ module Pod
         def initialize(argv)
           use_code_tag = argv.flag?('code')
           use_framework_tag = argv.flag?('framework')
-          banner! if use_code_tag && use_framework_tag
+          banner! if (use_code_tag && use_framework_tag) || (!use_code_tag && !use_framework_tag && !argv.empty?)
 
           KZ::KZGlobalHelper.instance.analyze_special_parameters(use_code_tag, use_framework_tag, argv.arguments!)
           if Pod.match_version?('~> 1.11')

data/lib/cocoapods-kz/gem_version.rb

@@ -1,5 +1,5 @@
 module CocoapodsKz
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 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

@@ -35,7 +35,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

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|
@@ -104,7 +113,7 @@ module KZ
         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)
@@ -169,7 +178,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 +205,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,18 @@ 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'
   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)
@@ -74,21 +76,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_pod_target.rb

@@ -27,17 +27,25 @@ module KZ
     attr_accessor :private_header_search_path
     attr_accessor :repair_header_search_path
 
+    attr_accessor :platform_name
     # target编译最终的产物名称
     attr_accessor :product_name
     # 对应xcode配置PRODUCT_NAME，当多个target的PRODUCT_NAME相同时，需要手动修改，防止打包报错
     attr_accessor :product_basename
-    # 当手动修改PRODUCT_NAME之后，@import需要修复为原使用方式
+    # 当手动修改PRODUCT_NAME之后，产物名称会改变，在framework模式下对于OC组件需要使用modulemap文件配置寻找路径，对于Swift组件需要配置单独的include path
     attr_accessor :repair_modulemap_path
+    attr_accessor :repair_swift_include_path
+
     # 当手动修改PRODUCT_NAME之后，#import<xx/xxx.h>需要修复为原使用方式，使用hmap进行映射
     attr_accessor :need_repair_module_import
 
     attr_accessor :use_local_private_headers_path
 
+    attr_accessor :force_load
+    attr_accessor :force_load_info
+
+    attr_accessor :use_modulemap
+
     def initialize(native_pod_target)
       @native_pod_target = native_pod_target
       @name = native_pod_target.name
@@ -49,10 +57,13 @@ module KZ
       @is_dev_pod = false
       @config_pod_mode = :kz_pod_origin_mode
 
+      @platform_name = native_pod_target.platform.symbolic_name
       @product_name = native_pod_target.origin_product_name
       @product_basename = native_pod_target.origin_product_basename
       @need_repair_module_import = false
       @use_local_private_headers_path = false
+      @force_load = false
+      @use_modulemap = true
 
       native_pod_target.file_accessors.each do |file_accessor|
         file_accessor.kz_pod_target = self
@@ -66,7 +77,6 @@ module KZ
     end
 
     def all_headers
-      return [] unless have_download_pod?
       @all_headers ||= begin
                          all_headers = []
                          native_pod_target.file_accessors.each do |file_accessor|
@@ -79,8 +89,6 @@ module KZ
     end
 
     def public_headers
-      return [] unless have_download_pod?
-
       @public_headers ||= begin
                             public_headers = []
                             native_pod_target.file_accessors.each do |file_accessor|
@@ -142,6 +150,17 @@ module KZ
           @repair_import << kz_repair_pod_target if kz_repair_pod_target
         end
       end
+
+      force_load = pod_config[:force_load]
+      if force_load.is_a?(TrueClass)
+        @force_load = true
+      end
+
+      use_modulemap = pod_config[:use_modulemap]
+      if use_modulemap.is_a?(FalseClass)
+        @use_modulemap = false
+      end
+
     end
 
     # 在当前target的所有依赖中，过滤有有修补的target
@@ -242,23 +261,58 @@ module KZ
       all_repair_modulemap_paths
     end
 
+    def all_repair_swift_include_paths
+      all_repair_swift_include_paths = []
+      all_repair_swift_include_paths << repair_swift_include_path if self.repair_swift_include_path
+      recursive_dependent_targets.each do |recursive_dependent_target|
+        all_repair_swift_include_paths.concat(recursive_dependent_target.all_repair_swift_include_paths)
+      end
+      all_repair_swift_include_paths.uniq! if all_repair_swift_include_paths.count > 0
+      all_repair_swift_include_paths
+    end
+
     def prefix_header_path
       @native_pod_target.prefix_header_path
     end
 
-    def have_download_pod?
-      native_pod_dir = @native_pod_target.sandbox.pod_dir(@root_name)
-      File.exist?(native_pod_dir) && !File.empty?(native_pod_dir)
+    # 当前pod是否存在可编译的文件，配置framework后当前pod就不存在可编译文件
+    def current_should_build?
+      @native_pod_target.should_build?
     end
 
-    def should_build?
-      have_download_pod? ? @native_pod_target.should_build? : false
+    # 原pod是否存在可编译的文件
+    def origin_should_build?
+      return @origin_should_build if defined? @origin_should_build
+      accessors = @native_pod_target.file_accessors.select { |fa| fa.spec.library_specification? }
+      all_origin_compile_files = []
+      accessors.each do |accessor|
+        all_origin_compile_files.concat(accessor.origin_source_files - accessor.kz_headers)
+      end
+      @origin_should_build = !all_origin_compile_files.empty?
     end
 
-    def uses_swift?
+    def current_uses_swift?
       @native_pod_target.uses_swift?
     end
 
+    def origin_uses_swift?
+      return @uses_swift if defined? @uses_swift
+      @uses_swift = (!origin_should_build? && !@native_pod_target.spec_swift_versions.empty?) ||
+        @native_pod_target.file_accessors.select { |a| a.spec.library_specification? }.any? do |file_accessor|
+          uses_swift_for_spec?(file_accessor.spec)
+        end
+    end
+
+    def uses_swift_for_spec?(spec)
+      @uses_swift_for_spec_cache ||= {}
+      return @uses_swift_for_spec_cache[spec.name] if @uses_swift_for_spec_cache.key?(spec.name)
+      @uses_swift_for_spec_cache[spec.name] = begin
+                                                file_accessor = @native_pod_target.file_accessors.find { |fa| fa.spec == spec }
+                                                raise "[Bug] Unable to find file accessor for spec `#{spec.inspect}` in pod target `#{label}`" unless file_accessor
+                                                file_accessor.origin_source_files.any? { |sf| sf.extname == '.swift' }
+                                              end
+    end
+
     def local_private_headers_path
       @local_private_headers_path ||= begin
                                         path = KZ_POD_CONFIG_POD_TARGETS + @name + "Headers"
@@ -267,5 +321,12 @@ module KZ
                                       end
     end
 
+    def configuration_build_dir(for_froce_load = false)
+      if for_froce_load
+        return @native_pod_target.configuration_build_dir + "/.force_load"
+      end
+      @native_pod_target.configuration_build_dir
+    end
+
   end
 end

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

@@ -27,6 +27,16 @@ module Pod
           kz_pod_config[name][:repair_import] = repair_import
         end
 
+        force_load = pod_attach.delete(:force_load)
+        if force_load
+          kz_pod_config[name][:force_load] = force_load
+        end
+
+        use_modulemap = pod_attach.delete(:use_modulemap)
+        if use_modulemap != nil
+          kz_pod_config[name][:use_modulemap] = use_modulemap
+        end
+
         KZ::KZGlobalHelper.instance.kz_pod_config.merge!(kz_pod_config)
       end
 

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

@@ -1,12 +1,21 @@
 require 'cocoapods/installer'
+require 'cocoapods-kz/helpers/kz_global_helper'
+require 'cocoapods-kz/helpers/kz_generator'
 
 module Pod
   class Installer
-    alias_method :original_integrate_user_project, :integrate_user_project
-    def integrate_user_project
-      original_integrate_user_project
-      if KZ::KZGlobalHelper.instance.kz_pod_enable
-        KZ::KZGlobalHelper.instance.write_lock_file
+
+    alias_method :original_download_dependencies, :download_dependencies
+    def download_dependencies
+      original_download_dependencies
+
+      # 因为kz_pod_target提供不少方法，需要判断pod文件情况，所以依赖分析需要挪到download之后
+      if KZ::KZGlobalHelper.instance.generate_kz_pod_targets
+        main_project = aggregate_targets.first.user_project
+        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)
       end
     end
 
@@ -18,5 +27,19 @@ module Pod
       end
       original_integrate
     end
+
+    # pod结束
+    alias_method :original_install!, :install!
+    def install!
+      original_install!
+
+      if KZ::KZGlobalHelper.instance.kz_pod_enable
+        KZ::KZGlobalHelper.instance.write_lock_file
+
+        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}') &")
+      end
+    end
   end
 end

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

@@ -13,5 +13,15 @@ module Pod
       end
     end
 
+    alias_method :origin_defines_module?, :defines_module?
+    def defines_module?
+      origin_result = origin_defines_module?
+      kz_pod_target = self.weakRef_kz_pod_target
+      if kz_pod_target && !kz_pod_target.use_modulemap
+        return false
+      end
+      return origin_result
+    end
+
   end
 end

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

@@ -10,16 +10,32 @@ module Pod
           alias_method :origin_install!, :install!
           def install!
             target_installation_result = origin_install!
-            if KZ::KZGlobalHelper.instance.kz_pod_enable && 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)
+            if KZ::KZGlobalHelper.instance.kz_pod_enable
+              kz_pod_target = self.target.weakRef_kz_pod_target
+
+              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)
+                end
+
+                if kz_pod_target&.is_dev_pod
+                  KZ::KZGlobalHelper.instance.kz_generator.add_flexlib_xml_build_rules(self.project, target_installation_result.native_target)
+                end
               end
 
-              kz_pod_target = self.target.weakRef_kz_pod_target
-              if kz_pod_target&.is_dev_pod
-                KZ::KZGlobalHelper.instance.kz_generator.add_flexlib_xml_build_rules(self.project, target_installation_result.native_target)
+              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)
+                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'
+                end
               end
             end
+
             target_installation_result
           end
 

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

@@ -0,0 +1,22 @@
+
+module Pod
+  class Installer
+    class Xcode
+      class PodsProjectWriter
+        alias_method :origin_def_save_projects, :save_projects
+        def save_projects(projects)
+          origin_def_save_projects(projects)
+
+          if KZ::KZGlobalHelper.instance.kz_pod_enable
+            projects.each do |project|
+              if project.project_name == "Pods"
+                project_pbxproj_path = project.path + 'project.pbxproj'
+                FileUtils.cp_r(project_pbxproj_path, KZ::KZ_POD_CONFIG_POD_TEMPDIR)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -28,6 +28,11 @@ module Pod
                       main_hamp_search_path += (' ' + KZ.deal_path_for_xcconfig(kz_pod_target.repair_header_search_path, true))
                     end
                     add_repair_modulemap(xcconfig, kz_pod_target.all_repair_modulemap_paths, self.target.uses_swift?)
+                    add_repair_swift_include_path(xcconfig, kz_pod_target.all_repair_swift_include_paths, self.target.uses_swift?)
+
+                    if kz_pod_target.force_load
+                      kz_add_force_load_tag(xcconfig, kz_pod_target)
+                    end
                   end
                 end
                 xcconfig.attributes['HEADER_SEARCH_PATHS'] = main_hamp_search_path
@@ -47,9 +52,12 @@ module Pod
                 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
-                xcconfig.attributes['KZ_MERGE_SWIFT_H_PATH'] = KZ.deal_path_for_xcconfig(KZ::KZ_MERGE_SWIFT_H_PATH)
+                if kz_pod_target.force_load
+                  xcconfig.attributes['KZ_FIX_FORCE_LOAD_EXE_FOLDER'] = kz_pod_target.configuration_build_dir(true)
+                end
 
-                add_repair_modulemap(xcconfig, kz_pod_target.all_repair_modulemap_paths, kz_pod_target.uses_swift?)
+                add_repair_modulemap(xcconfig, kz_pod_target.all_repair_modulemap_paths, kz_pod_target.current_uses_swift?)
+                add_repair_swift_include_path(xcconfig, kz_pod_target.all_repair_swift_include_paths, kz_pod_target.current_uses_swift?)
                 kz_update_xcconfig_file(xcconfig, path)
                 return
               end
@@ -74,6 +82,18 @@ module Pod
             end
           end
 
+          def add_repair_swift_include_path(xcconfig, repair_swift_include_paths, uses_swift)
+            # 只有当前pod支持swift，才需要所依赖的pod提供的swiftmodule
+            if repair_swift_include_paths.count > 0 && uses_swift
+              repair_swift_include_paths.each do |repair_swift_include_path|
+                swift_include_path = ' ' + KZ.deal_path_for_xcconfig(repair_swift_include_path, true)
+                unless xcconfig.attributes['SWIFT_INCLUDE_PATHS'].include?(swift_include_path)
+                  xcconfig.attributes['SWIFT_INCLUDE_PATHS'] += swift_include_path
+                end
+              end
+            end
+          end
+
           def kz_update_xcconfig_file(xcconfig, path)
             if path.exist?
               contents = xcconfig.to_s
@@ -106,6 +126,15 @@ module Pod
             xcconfig.attributes['OTHER_CFLAGS'] = new_flags.join(' ')
           end
 
+          def kz_add_force_load_tag(xcconfig, kz_pod_target)
+            other_linker_flags = xcconfig.other_linker_flags
+            frameworks_flags = other_linker_flags[:frameworks]
+            force_flags = other_linker_flags[:force_load]
+
+            frameworks_flags.delete(kz_pod_target.product_basename)
+            force_flags.add(KZ.deal_path_for_xcconfig(kz_pod_target.force_load_info, true))
+          end
+
         end
       end
     end

data/lib/cocoapods-kz/native.rb

@@ -5,11 +5,11 @@ if Pod.match_version?('~> 1.11')
   require 'cocoapods-kz/native/dls'
   require 'cocoapods-kz/native/installer'
   require 'cocoapods-kz/native/acknowledgements'
-  require 'cocoapods-kz/native/analyzer'
   require 'cocoapods-kz/native/file_accessor'
   require 'cocoapods-kz/native/target'
   require 'cocoapods-kz/native/target_installer_helper'
   require 'cocoapods-kz/native/pod_target'
   require 'cocoapods-kz/native/pod_target_installer'
   require 'cocoapods-kz/native/specification'
+  require 'cocoapods-kz/native/pods_project_writer'
 end

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

@@ -0,0 +1,12 @@
+if [ "${MACH_O_TYPE}" != "staticlib" ]; then
+    exit 0
+fi
+
+CURRENT_PRODUCT_DIR=${PODS_CONFIGURATION_BUILD_DIR}/${TARGET_NAME}
+
+if [ -d "${KZ_FIX_FORCE_LOAD_EXE_FOLDER}" ]; then
+    rm -r "${KZ_FIX_FORCE_LOAD_EXE_FOLDER}"
+fi
+mkdir -p "${KZ_FIX_FORCE_LOAD_EXE_FOLDER}"
+
+ln -s ${CURRENT_PRODUCT_DIR}/${FULL_PRODUCT_NAME} ${KZ_FIX_FORCE_LOAD_EXE_FOLDER}/${FULL_PRODUCT_NAME}

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

@@ -2,40 +2,36 @@ if [ "${MACH_O_TYPE}" != "staticlib" ]; then
     exit 0
 fi
 
-PRODUCT_DIR=${PODS_BUILD_DIR}/Debug-iphoneos/${TARGET_NAME}/${FULL_PRODUCT_NAME}
-PRODUCT_SIMULATOR_DIR=${PODS_BUILD_DIR}/Debug-iphonesimulator/${TARGET_NAME}/${FULL_PRODUCT_NAME}
-CURRENT_PRODUCT_DIR=${PODS_CONFIGURATION_BUILD_DIR}/${TARGET_NAME}
-
 if [ -d "${KZ_FRAMEWORK_CACHE_PATH}" ]; then
     rm -r "${KZ_FRAMEWORK_CACHE_PATH}"
 fi
 mkdir -p "${KZ_FRAMEWORK_CACHE_PATH}"
 
-if [ -d "${KZ_FRAMEWORK_CACHE_PATH}/${FULL_PRODUCT_NAME}" ]; then
-    rm -r "${KZ_FRAMEWORK_CACHE_PATH}/${FULL_PRODUCT_NAME}"
-fi
-cp -r ${CURRENT_PRODUCT_DIR}/${FULL_PRODUCT_NAME} "${KZ_FRAMEWORK_CACHE_PATH}"
-
+CURRENT_PRODUCT_DIR=${PODS_CONFIGURATION_BUILD_DIR}/${TARGET_NAME}
 find "${CURRENT_PRODUCT_DIR}" -iname "*.bundle" | while read -r BUNDLE_FILE; do
-    BUNDLE_NAME=$(basename ${BUNDLE_FILE})
+    BUNDLE_NAME=$(basename "${BUNDLE_FILE}")
     if [ -d "${KZ_FRAMEWORK_CACHE_PATH}/${BUNDLE_NAME}" ]; then
         rm -r "${KZ_FRAMEWORK_CACHE_PATH}/${BUNDLE_NAME}"
     fi
-    cp -r ${BUNDLE_FILE} "${KZ_FRAMEWORK_CACHE_PATH}"
+    cp -r "${BUNDLE_FILE}" "${KZ_FRAMEWORK_CACHE_PATH}"
 done
 
-if [ -f ${PRODUCT_DIR}/${PRODUCT_NAME} ] && [ -f ${PRODUCT_SIMULATOR_DIR}/${PRODUCT_NAME} ]; then
-    lipo -create ${PRODUCT_DIR}/${PRODUCT_NAME} ${PRODUCT_SIMULATOR_DIR}/${PRODUCT_NAME} -output "${KZ_FRAMEWORK_CACHE_PATH}/${FULL_PRODUCT_NAME}/${PRODUCT_NAME}"
+OPPOSE_PLATFORM_NAME=''
+if [ -n "${CORRESPONDING_SIMULATOR_PLATFORM_NAME+set}" ]; then
+    OPPOSE_PLATFORM_NAME=${CORRESPONDING_SIMULATOR_PLATFORM_NAME}
+elif [ -n "${CORRESPONDING_DEVICE_PLATFORM_NAME+set}" ]; then
+    OPPOSE_PLATFORM_NAME=${CORRESPONDING_DEVICE_PLATFORM_NAME}
 fi
 
-if [ -d ${PRODUCT_DIR}/Modules/${PRODUCT_NAME}.swiftmodule ] && [ -d ${PRODUCT_SIMULATOR_DIR}/Modules/${PRODUCT_NAME}.swiftmodule ]; then
-    cp -r ${PRODUCT_DIR}/Modules/${PRODUCT_NAME}.swiftmodule "${KZ_FRAMEWORK_CACHE_PATH}/${FULL_PRODUCT_NAME}/Modules"
-    cp -r ${PRODUCT_SIMULATOR_DIR}/Modules/${PRODUCT_NAME}.swiftmodule "${KZ_FRAMEWORK_CACHE_PATH}/${FULL_PRODUCT_NAME}/Modules"
+if [ "${OPPOSE_PLATFORM_NAME}" = "" ]; then
+    exit 0
 fi
 
-PRODUCT_SWIFT_H=${PRODUCT_DIR}/Headers/${PRODUCT_NAME}-Swift.h
-PRODUCT_SIMULATOR_SWIFT_H=${PRODUCT_SIMULATOR_DIR}/Headers/${PRODUCT_NAME}-Swift.h
-TARGET_SWIFT_H=${KZ_FRAMEWORK_CACHE_PATH}/${FULL_PRODUCT_NAME}/Headers/${PRODUCT_NAME}-Swift.h
-if [ -f $PRODUCT_SWIFT_H ] && [ -f $PRODUCT_SIMULATOR_SWIFT_H ]; then
-    ruby "$KZ_MERGE_SWIFT_H_PATH" "$PRODUCT_SWIFT_H" "$PRODUCT_SIMULATOR_SWIFT_H" "$TARGET_SWIFT_H"
-fi
+OPPOSE_PRODUCT_FULL_DIR=${PODS_BUILD_DIR}/${CONFIGURATION}-${OPPOSE_PLATFORM_NAME}/${TARGET_NAME}/${FULL_PRODUCT_NAME}
+if [ -d "${OPPOSE_PRODUCT_FULL_DIR}" ]; then
+    xcodebuild -create-xcframework -allow-internal-distribution -framework $(readlink -f "${CURRENT_PRODUCT_DIR}/${FULL_PRODUCT_NAME}") -framework $(readlink -f "${OPPOSE_PRODUCT_FULL_DIR}") \
+    -output "${KZ_FRAMEWORK_CACHE_PATH}/${PRODUCT_NAME}.xcframework"
+else
+    xcodebuild -create-xcframework -allow-internal-distribution -framework $(readlink -f "${CURRENT_PRODUCT_DIR}/${FULL_PRODUCT_NAME}") \
+    -output "${KZ_FRAMEWORK_CACHE_PATH}/${PRODUCT_NAME}.xcframework"
+fi

data/lib/cocoapods-kz/resources/kz_refresh_pods_pbxproj.rb

@@ -0,0 +1,15 @@
+require 'fileutils'
+require 'pathname'
+
+current_pods_pbxproj_path = Pathname.new(ARGV[0])
+temp_pods_pbxproj_path = Pathname.new(ARGV[1])
+
+if !File.exist?(current_pods_pbxproj_path) || !FileUtils.compare_file(current_pods_pbxproj_path, temp_pods_pbxproj_path)
+  FileUtils.cp_r(temp_pods_pbxproj_path, current_pods_pbxproj_path)
+end
+
+xcode_running = system("ps aux | grep '[X]code' > /dev/null 2>&1")
+if xcode_running
+  system("touch #{current_pods_pbxproj_path}")
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-kz
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - yixiong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2024-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -48,6 +48,7 @@ files:
 - lib/cocoapods-kz.rb
 - lib/cocoapods-kz/command.rb
 - lib/cocoapods-kz/command/clean.rb
+- lib/cocoapods-kz/command/info.rb
 - lib/cocoapods-kz/command/install.rb
 - lib/cocoapods-kz/command/kz.rb
 - lib/cocoapods-kz/command/repair.rb
@@ -63,19 +64,20 @@ files:
 - lib/cocoapods-kz/helpers/repair_module_import.rb
 - lib/cocoapods-kz/native.rb
 - lib/cocoapods-kz/native/acknowledgements.rb
-- lib/cocoapods-kz/native/analyzer.rb
 - lib/cocoapods-kz/native/dls.rb
 - lib/cocoapods-kz/native/file_accessor.rb
 - lib/cocoapods-kz/native/installer.rb
 - lib/cocoapods-kz/native/pod_target.rb
 - lib/cocoapods-kz/native/pod_target_installer.rb
+- lib/cocoapods-kz/native/pods_project_writer.rb
 - lib/cocoapods-kz/native/specification.rb
 - lib/cocoapods-kz/native/target.rb
 - lib/cocoapods-kz/native/target_installer_helper.rb
 - lib/cocoapods-kz/resources/FlexCompiler
 - 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_merge_swift_h.rb
+- lib/cocoapods-kz/resources/kz_refresh_pods_pbxproj.rb
 - lib/cocoapods-kz/resources/kz_xml_build.sh
 - lib/cocoapods_plugin.rb
 homepage: https://github.com/EXAMPLE/cocoapods-kz

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

@@ -1,23 +0,0 @@
-require 'cocoapods-kz/helpers/kz_global_helper'
-require 'cocoapods-kz/helpers/kz_generator'
-
-module Pod
-  class Installer
-    class Analyzer
-      alias_method :original_generate_targets, :generate_targets
-
-      def generate_targets(resolver_specs_by_target, target_inspections)
-        aggregate_targets, pod_targets = original_generate_targets(resolver_specs_by_target, target_inspections)
-        if KZ::KZGlobalHelper.instance.generate_kz_pod_targets
-          main_project = aggregate_targets.first.user_project
-          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)
-        end
-        [aggregate_targets, pod_targets]
-      end
-
-    end
-  end
-end

data/lib/cocoapods-kz/resources/kz_merge_swift_h.rb

@@ -1,14 +0,0 @@
-require 'fileutils'
-require 'pathname'
-
-product_swift_h_path = Pathname.new(ARGV[0])
-product_simulator_swift_h_path = Pathname.new(ARGV[1])
-target_swfit_h_path = Pathname.new(ARGV[2])
-
-if File.exist?(product_swift_h_path) && File.exist?(product_simulator_swift_h_path)
-  FileUtils.cp_r(product_swift_h_path, target_swfit_h_path)
-  replacement = File.read(product_simulator_swift_h_path)
-  content_a = File.read(target_swfit_h_path)
-  content_a.gsub!("#error unsupported Swift architecture", replacement)
-  File.write(target_swfit_h_path, content_a)
-end