cocoapods-kz 0.0.17 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d054c8e5514bb6136c627613b061ced1961f9f069d0c6160718f060d8394b4d
-  data.tar.gz: cced90a605f5652c04c46f39d4f44ef3ab21da9131842b3cbbe22fe0bb8eb58c
+  metadata.gz: 7dc3d17ae852663339c556b8ce756e1d6072f409a0355857be8b4e853b28c5b4
+  data.tar.gz: 82f389a34190b85f569d70452af68a6648164a245e272211338df351c1d5ee6d
 SHA512:
-  metadata.gz: 5b83c0a3b25538cf2d6dfff81c419de10062a93ec78480fc3022df7c751e7bb920d130f6d2f93740bfed80fd4c80b335979606d5d649cc75c6e3bbca4297020a
-  data.tar.gz: 6deb0853f199c345a66bfef9e0f10da7d1493bc20a6bc1b05c14ef4bae455f3187658b14c42d90bca096085557ab1aee3153d2feee22621c360cbc5a2dd4cbac
+  metadata.gz: bb1640b3a067294022afd664ba651dc99321fcfbcb9215d7234a533dc50b72ec164749d26f5557582732a93ce2414ae327f818111216f5f6a682960ddb2a3fcf
+  data.tar.gz: 3159244490814d002460a3b6a843b36668735798c195963ed6934eb67ac11b564dabe50217204df291da76df5e222b3a0312c257f135b72b1ad2cc2379b196d8

data/lib/cocoapods-kz/gem_version.rb

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

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

@@ -48,22 +48,25 @@ module KZ
         result = KZGlobalHelper.instance.pod_config_result_with_target(kz_pod_target)
         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
-            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 = "#{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"
+          if kz_pod_target.origin_should_build?
+            kz_pod_target.product_name = "#{kz_pod_target.name}.framework"
+            kz_pod_target.product_basename = kz_pod_target.name
+            if result
+              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 = "#{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
+            KZLog.log("检测到多个target编译产物名均为：#{temp_name}，已配置#{kz_pod_target.name}使用新产物名：#{kz_pod_target.name}.framework，并使用modulemap进行修复引用方式保持不变", :info)
           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?
+          kz_pod_target.have_same_root = true
+        elsif kz_pod_target
           temp_repeat_product_name << "#{temp_name}"
         end
 
@@ -83,7 +86,14 @@ module KZ
       if @all_kz_pod_targets.has_key?(native_pod_target_name)
         kz_pod_target = @all_kz_pod_targets[native_pod_target_name]
         if !kz_pod_target.is_dev_pod && config_pod_mode != :kz_pod_origin_mode
-          kz_pod_target.config_pod_mode = config_pod_mode
+          # 如果没有走任何模式，则保持pod本身模式不变
+          if KZGlobalHelper.instance.specify_pod_mode == :kz_pod_framework_mode
+            # framework模式优先
+            kz_pod_target.config_pod_mode = config_pod_mode unless kz_pod_target.config_pod_mode == :kz_pod_framework_mode
+          elsif KZGlobalHelper.instance.specify_pod_mode == :kz_pod_code_mode
+            # code模式优先
+            kz_pod_target.config_pod_mode = config_pod_mode unless kz_pod_target.config_pod_mode == :kz_pod_code_mode
+          end
         end
       else
         kz_pod_target = KZPodTarget.new(native_pod_target)
@@ -96,10 +106,16 @@ module KZ
           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
+        if KZGlobalHelper.instance.specify_pod_mode == :kz_pod_origin_mode
+          # 没有指定任何模式，优先使用上次记录
+          kz_pod_target.config_pod_mode = use_framework_mode_from_lock_file?(kz_pod_target)
         else
-          kz_pod_target.config_pod_mode = get_use_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
+          else
+            kz_pod_target.config_pod_mode = get_use_config_pod_mode(kz_pod_target)
+          end
         end
         @all_kz_pod_targets[native_pod_target_name] = kz_pod_target
 
@@ -159,8 +175,6 @@ module KZ
         specify_pod_names_contain(kz_pod_target.name) ? :kz_pod_framework_mode : :kz_pod_code_mode
       elsif KZGlobalHelper.instance.specify_pod_mode == :kz_pod_code_mode
         specify_pod_names_contain(kz_pod_target.name) ? :kz_pod_code_mode : :kz_pod_framework_mode
-      elsif KZGlobalHelper.instance.specify_pod_mode == :kz_pod_origin_mode
-        use_framework_mode_from_lock_file?(kz_pod_target)
       end
     end
 
@@ -183,7 +197,7 @@ module KZ
     def use_framework_mode_from_lock_file?(kz_pod_target)
       olde_lock_file_content = KZGlobalHelper.instance.olde_lock_file_content
       if olde_lock_file_content
-        pod_lock_config = olde_lock_file_content[kz_pod_target.name]
+        pod_lock_config = olde_lock_file_content["pod_targets"][kz_pod_target.name]
         return :kz_pod_framework_mode if pod_lock_config && pod_lock_config['use_framework']
       end
       :kz_pod_code_mode

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

@@ -300,7 +300,9 @@ module KZ
 
       yaml_header_info = {}
       yaml_header_info["type"] = "directory"
-      yaml_header_info["name"] = built_products_dir + "#{kz_pod_target.product_name}/Headers"
+      # 使用origin_product_name，是因为kz_analyzer中对于拥有相同product_name的target的product_name改成了target_name
+      # 但是新版Xcode的编译过程包含一个scan步骤，会使用hamp中映射的framework，hmap中使用的是原始product_name，这里需要与之同步
+      yaml_header_info["name"] = built_products_dir + "#{kz_pod_target.origin_product_name}/Headers"
       yaml_roots.append(yaml_header_info)
 
       public_headers = kz_pod_target.public_headers
@@ -316,7 +318,7 @@ module KZ
 
       yaml_modulemap_info = {}
       yaml_modulemap_info["type"] = "directory"
-      yaml_modulemap_info["name"] = built_products_dir + "#{kz_pod_target.product_name}/Modules"
+      yaml_modulemap_info["name"] = built_products_dir + "#{kz_pod_target.origin_product_name}/Modules"
       yaml_roots.append(yaml_modulemap_info)
 
       yaml_modulemap_contents = []
@@ -325,7 +327,7 @@ module KZ
       yaml_modulemap_content = {}
       yaml_modulemap_content["type"] = "file"
       yaml_modulemap_content["name"] = "module.modulemap"
-      yaml_modulemap_content["external-contents"] = built_products_dir + "#{kz_pod_target.product_name}/Modules/module.modulemap"
+      yaml_modulemap_content["external-contents"] = built_products_dir + "#{kz_pod_target.origin_product_name}/Modules/module.modulemap"
       yaml_modulemap_contents.append(yaml_modulemap_content)
 
       pod_yaml_info

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

@@ -12,8 +12,10 @@ module KZ
       normal:   ""
     }
 
-    def self.log(log_string, type = :normal)
+    def self.log(log_string, type = :normal, skip_count = 1)
       if KZGlobalHelper.instance.debug || type == :error || type == :warning
+        loc = caller_locations(skip_count, 1).first
+        puts "#{loc.path}:#{loc.lineno} ⬇️"
         puts "\e[36m【Cocoapods-kz】\e[0m#{@log_types[type]}【#{type}】#{@log_types[:reset]}#{log_string}"
       end
     end
@@ -21,8 +23,8 @@ module KZ
     def self.run_shell(cmd)
       stdout, stderr, status = Open3.capture3(cmd)
 
-      self.log(stdout) unless stdout.empty?
-      self.log(stderr, :error) unless stderr.empty?
+      self.log(stdout, :normal, 2) unless stdout.empty?
+      self.log(stderr, :error, 2) unless stderr.empty?
 
       return status.success?
     end

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

@@ -34,8 +34,12 @@ module KZ
     attr_accessor :custom_origin_yaml_path
 
     attr_accessor :platform_name
+    # 是否存在跟其他pod相同的root pod，一搬为同一个pod，再不同target中拆分为sub pod使用
+    attr_accessor :have_same_root
     # target编译最终的产物名称
     attr_accessor :product_name
+    # target原始产物名称
+    attr_accessor :origin_product_name
     # 对应xcode配置PRODUCT_NAME，当多个target的PRODUCT_NAME相同时，需要手动修改，防止打包报错
     attr_accessor :product_basename
     # 当手动修改PRODUCT_NAME之后，产物名称会改变，在framework模式下对于OC组件需要使用modulemap文件配置寻找路径，对于Swift组件需要配置单独的include path
@@ -69,7 +73,9 @@ module KZ
       @config_pod_mode = :kz_pod_origin_mode
 
       @platform_name = native_pod_target.platform.symbolic_name
+      @have_same_root = false
       @product_name = native_pod_target.origin_product_name
+      @origin_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

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

@@ -14,6 +14,15 @@ module Pod
 
             xcframeworks = target.xcframeworks.values.flatten
 
+            kz_pod_target = target.weakRef_kz_pod_target
+            if kz_pod_target&.have_same_root
+              # 如果产物相同，极大可能为sub pod模式，xcframework有相同处理指令，导致并发执行rsync报错
+              # 这里延迟0.2秒可以极大减少这种错误产生
+              script_content = File.read(target.copy_xcframeworks_script_path)
+              new_script_content = script_content.sub(/(install_xcframework "\$\{PODS_ROOT})/, "sleep 0.2\n\\1")
+              File.write(target.copy_xcframeworks_script_path, new_script_content)
+            end
+
             if use_input_output_paths? && !xcframeworks.empty?
               input_file_list_path = target.copy_xcframeworks_script_input_files_path
               input_file_list_relative_path = "${PODS_ROOT}/#{input_file_list_path.relative_path_from(target.sandbox.root)}"

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

@@ -10,6 +10,9 @@ VARS=(
   LANG
   LC_ALL
 )
+# 清空之前变量
+echo "" > "$OUTPUT_FILE"
+
 for var in "${VARS[@]}"; do
   val="${!var}"
   if [ -n "$val" ]; then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-kz
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.1.1
 platform: ruby
 authors:
 - yixiong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-12 00:00:00.000000000 Z
+date: 2025-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler