cocoapods-kz 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46e0c9230296bcc63a1a7dc8c0049a03047d9c9458329fcd447518efb667a7de
-  data.tar.gz: 7d9504733bbec7908497dae4aaa3575042310cf435efc156dac2fbaffbd358fa
+  metadata.gz: 6c9619f1947bb18ec49029b61641468d7f9df706184017ec8e77d2b17d1a58d0
+  data.tar.gz: dce63b4ca62cea830b0104106f92166ac0fa9b7d00e0110378f32efe4d43fe94
 SHA512:
-  metadata.gz: 58ea2d44a9f3c144dd8bb4a5b3e31a469a9027ef59ad51dec6bd681ea36114ed751451393e739dbd583f4904118edb116ece715a3044de12a24bc11f709a6bb9
-  data.tar.gz: 8c0ad50abe85677d019d292bc8cfde63376a6e12b8e9ba36b09a3ceb15584606aef5578b18279f4369f2be9e6318cd16a227381a2d4da12451f892c3293dbb20
+  metadata.gz: 349028d335d34a1d9b186d61e377c78feb03ebe4447136970e469f192ec6e7bf785026fa2420fd31714f7c9172abdb14f533ceb8e090a13accba984ea116198b
+  data.tar.gz: 646ca98a19160714c566e70f64b1f822f6a05e9f1531c1970ec0e89534198054c71e2c2b24659cb747cfb2c8592a6a79c335d1ff6f29f504f604cc9368186bbe

data/lib/cocoapods-kz/gem_version.rb

@@ -1,5 +1,5 @@
 module CocoapodsKz
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end
 
 module Pod

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

@@ -98,7 +98,7 @@ module KZ
         xcframework_path = destination_path + "#{framework_basename}.xcframework"
         return xcframework_path if File.exist?(xcframework_path) && !Dir.empty?(xcframework_path)
 
-        if self.create_xcframework(origin_framework_path, origin_framework_path, framework_basename, xcframework_path)
+        if self.create_xcframework(origin_framework_path, framework_basename, xcframework_path)
           return xcframework_path
         else
           return origin_framework_path
@@ -121,34 +121,47 @@ module KZ
           end
         end
 
-        # 找到真机arm64 framework与模拟器x86_64 framework
+        # 找到真机arm64 framework
         xc_framework_path = ""
-        xc_simulator_framework_path = ""
         available_libraries.each do |available_librarie|
-          if available_librarie["SupportedPlatformVariant"] == "simulator"
-            if available_librarie["SupportedArchitectures"].include?("x86_64")
-              xc_simulator_framework_path = origin_framework_path + available_librarie["LibraryIdentifier"] + available_librarie["LibraryPath"]
+          if available_librarie["SupportedPlatform"] == "ios"
+            if available_librarie["SupportedArchitectures"].include?("arm64")
+              xc_framework_path = origin_framework_path + available_librarie["LibraryIdentifier"] + available_librarie["LibraryPath"]
             end
-          elsif available_librarie["SupportedPlatform"] == "ios"
-              if available_librarie["SupportedArchitectures"].include?("arm64")
-                xc_framework_path = origin_framework_path + available_librarie["LibraryIdentifier"] + available_librarie["LibraryPath"]
-              end
           end
         end
 
-        xc_simulator_framework_path = xc_framework_path unless xc_simulator_framework_path != ""
-        if self.create_xcframework(xc_framework_path, xc_simulator_framework_path, framework_basename, xcframework_path)
-          return xcframework_path
-        else
+        if xc_framework_path == "" || !self.create_xcframework(xc_framework_path, framework_basename, xcframework_path)
           return origin_framework_path
+        else
+          return xcframework_path
         end
       else
         return origin_framework_path
       end
     end
 
-    def self.create_xcframework(origin_framework_path, origin_simulator_framework_path, framework_basename, destination_xcframework_path)
+    # 将 xcframework slice 中直接提供的 .a 包装成 create_xcframework 可处理的 .framework。
+    # 除了静态库本身，也保留同级目录中的 Headers、Modules 等支持文件。
+    def self.convert_static_library_to_framework(origin_library_path, framework_basename, destination_path)
+      return origin_library_path unless File.extname(origin_library_path.to_s) == ".a"
+
+      framework_path = destination_path + "#{framework_basename}.framework"
+      framework_library_path = framework_path + origin_library_path.basename
+      framework_executable_path = framework_path + framework_basename
+      FileUtils.mkdir_p(framework_path)
+      Dir.children(origin_library_path.parent).each do |entry|
+        FileUtils.cp_r(origin_library_path.parent + entry, framework_path)
+      end
+      FileUtils.mv(framework_library_path, framework_executable_path)
+      KZLog.log("'#{origin_library_path.basename}' 已包装为 framework，继续创建 xcframework")
+      framework_path
+    end
+
+    def self.create_xcframework(origin_framework_path, framework_basename, destination_xcframework_path)
       tempdir = Pathname(Dir.mktmpdir)
+      origin_framework_path = self.convert_static_library_to_framework(origin_framework_path, framework_basename, tempdir + "origin")
+
       arm64_path = tempdir + "arm64"
       FileUtils.mkdir_p(arm64_path)
       arm64_framework_path = arm64_path + "#{framework_basename}.framework"
@@ -161,20 +174,14 @@ module KZ
       simulator_path = tempdir + "simulator"
       FileUtils.mkdir_p(simulator_path)
       simulator_framework_path = simulator_path + "#{framework_basename}.framework"
-      FileUtils.cp_r(origin_simulator_framework_path, simulator_framework_path)
+      FileUtils.cp_r(arm64_framework_path, simulator_framework_path)
       simulator_framework_exe_path = simulator_framework_path + framework_basename
-      contain_x8664 = self.contain_x8664?(simulator_framework_exe_path)
-      if contain_x8664
-        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)
+      if self.is_dynamic_library?(arm64_framework_exe_path)
         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)
+        xcrun_vtool_show_result = `xcrun vtool -arch arm64 -show #{arm64_framework_exe_path}`.lines.map(&:chomp)
         framework_sdk_version = "16.0"
         framework_deployment_version = "12.0"
         reach_cmd_tag = false
@@ -205,8 +212,8 @@ module KZ
       else
         ar_x_path = tempdir + "ar_x"
         FileUtils.mkdir_p(ar_x_path)
-        if self.is_current_ar_archive?(origin_framework_path + framework_basename)
-          KZLog.log("'#{origin_framework_path.basename}' 是一个ar archive类型静态库，开始拆分.o并重新构建")
+        if self.is_current_ar_archive?(arm64_framework_exe_path)
+          KZLog.log("'#{arm64_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
@@ -232,11 +239,7 @@ module KZ
         end
       end
 
-      if contain_x8664
-        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.mv("#{temp_framwork_exe_path}", simulator_framework_exe_path)
       FileUtils.mkdir_p(destination_xcframework_path) unless File.exist?(destination_xcframework_path)
       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)
@@ -254,11 +257,6 @@ module KZ
       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")
-    end
-
     def self.contain_multiple_arch?(file_path)
       file_result = `lipo -info #{file_path}`
       return file_result.include?("Architectures in the fat file")

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

@@ -13,7 +13,7 @@ module KZ
     }
 
     def self.log(log_string, type = :normal, skip_count = 1)
-      if KZGlobalHelper.instance.debug || type == :error || type == :warning
+      if KZGlobalHelper.instance.debug || type == :error
         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}"
@@ -24,7 +24,7 @@ module KZ
       stdout, stderr, status = Open3.capture3(cmd)
 
       self.log(stdout, :normal, 2) unless stdout.empty?
-      self.log(stderr, :error, 2) unless stderr.empty?
+      self.log(stderr, status.success? ? :warning : :error, 2) unless stderr.empty?
 
       return status.success?
     end

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

@@ -14,13 +14,13 @@ 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秒可以极大减少这种错误产生
+            # XCFramework 的输出目录由 xcframework.target_name 决定，不能只根据
+            # have_same_root 判断是否冲突：首个同名 target 或其他 root pod 也可能复制到
+            # 同一个 destination。所有 Copy XCFramework 脚本都加 destination 级别的锁；
+            # 不同 destination 的复制仍可并行。
+            unless xcframeworks.empty?
               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)
+              File.write(target.copy_xcframeworks_script_path, kz_lock_xcframework_rsync(script_content))
             end
 
             if use_input_output_paths? && !xcframeworks.empty?
@@ -64,6 +64,30 @@ module Pod
                 native_target, script_path, input_paths_by_config, output_paths_by_config)
             end
           end
+
+          # 保留 CocoaPods 原始 rsync 命令，仅在执行前插入 destination 级别的文件锁。
+          # 不同 destination 可并行复制；同一 destination 的多个脚本会串行执行。
+          def kz_lock_xcframework_rsync(script_content)
+            lock_marker = '# COCOAPODS_KZ_XCFRAMEWORK_RSYNC_LOCK'
+            return script_content if script_content.include?(lock_marker)
+
+            rsync_pattern = /^([ \t]*)(rsync\s+--delete\b[^\r\n]*)$/
+            match = rsync_pattern.match(script_content)
+            unless match
+              raise 'Unable to locate the XCFramework rsync command for the copy lock patch.'
+            end
+
+            indent = match[1]
+            rsync_command = match[2]
+            locked_command = [
+              "#{indent}#{lock_marker}",
+              "#{indent}# Serialize only copies that share the same XCFramework destination.",
+              "#{indent}local lock_file=\"${PODS_XCFRAMEWORKS_BUILD_DIR}/.cocoapods-kz-xcframeworks-$(printf '%s' \"${destination}\" | shasum -a 256 | awk '{print $1}').lock\"",
+              "#{indent}/usr/bin/lockf -k -w \"${lock_file}\" #{rsync_command}",
+            ].join("\n")
+
+            script_content.sub(rsync_pattern, locked_command)
+          end
         end
       end
     end

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

@@ -54,7 +54,8 @@ module Pod
                 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.delete_if { |key, _value| key.to_s.start_with?("VALID_ARCHS") }
+                  xcconfig.attributes.delete_if { |key, _value| key.to_s.start_with?("EXCLUDED_ARCHS") }
                   xcconfig.attributes['VALID_ARCHS'] = 'arm64 arm64_32 x86_64'
                 end
                 if KZ::KZGlobalHelper.instance.on_demand_resources_info.odr_target_names.include?(self.target.name.sub('Pods-', ''))
@@ -98,7 +99,8 @@ module Pod
                   xcconfig.attributes['KZ_FIX_FORCE_LOAD_EXE_FOLDER'] = kz_pod_target.configuration_build_dir(true)
                 end
                 if KZ::KZGlobalHelper.instance.arm64_simulator
-                  xcconfig.attributes.delete("EXCLUDED_ARCHS[sdk=iphonesimulator*]")
+                  xcconfig.attributes.delete_if { |key, _value| key.to_s.start_with?("VALID_ARCHS") }
+                  xcconfig.attributes.delete_if { |key, _value| key.to_s.start_with?("EXCLUDED_ARCHS") }
                   xcconfig.attributes['VALID_ARCHS'] = 'arm64 arm64_32 x86_64'
                 end
 

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

@@ -4,9 +4,11 @@ if [ "${MACH_O_TYPE}" != "staticlib" ]; then
     exit 0
 fi
 
+XCFRAMEWORK_OUTPUT="${KZ_FRAMEWORK_CACHE_PATH}/${PRODUCT_NAME}.xcframework"
+
 if [ -d "${KZ_FRAMEWORK_CACHE_PATH}" ]; then
-    if [ -d "${KZ_FRAMEWORK_CACHE_PATH}/${PRODUCT_NAME}.xcframework" ]; then
-        rm -r "${KZ_FRAMEWORK_CACHE_PATH}/${PRODUCT_NAME}.xcframework"
+    if [ -d "${XCFRAMEWORK_OUTPUT}" ]; then
+        rm -r "${XCFRAMEWORK_OUTPUT}"
     fi
 else
     mkdir -p "${KZ_FRAMEWORK_CACHE_PATH}"
@@ -34,10 +36,59 @@ if [ "${OPPOSE_PLATFORM_NAME}" = "" ]; then
 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"
+OPPOSE_BINARY="${OPPOSE_PRODUCT_FULL_DIR}/${PRODUCT_NAME}"
+
+resolve_framework_path() {
+    local FRAMEWORK_PATH="$1"
+    local RESOLVED_PATH
+    RESOLVED_PATH=$(readlink -f "${FRAMEWORK_PATH}" 2>/dev/null)
+    if [ $? -ne 0 ] || [ -z "${RESOLVED_PATH}" ] || [ ! -d "${RESOLVED_PATH}" ]; then
+        return 1
+    fi
+    echo "${RESOLVED_PATH}"
+}
+
+remove_xcframework_output() {
+    if [ -d "${XCFRAMEWORK_OUTPUT}" ]; then
+        rm -r "${XCFRAMEWORK_OUTPUT}"
+    fi
+}
+
+create_single_platform_xcframework() {
+    remove_xcframework_output
+    xcodebuild -create-xcframework -allow-internal-distribution \
+        -framework "${CURRENT_FRAMEWORK_PATH}" \
+        -output "${XCFRAMEWORK_OUTPUT}"
+}
+
+if ! CURRENT_FRAMEWORK_PATH=$(resolve_framework_path "${CURRENT_PRODUCT_DIR}/${FULL_PRODUCT_NAME}"); then
+    echo "error: [KZ] Unable to resolve current platform framework: ${CURRENT_PRODUCT_DIR}/${FULL_PRODUCT_NAME}" >&2
+    exit 1
+fi
+
+CURRENT_BINARY="${CURRENT_FRAMEWORK_PATH}/${PRODUCT_NAME}"
+if [ ! -f "${CURRENT_BINARY}" ] || [ ! -r "${CURRENT_BINARY}" ]; then
+    echo "error: [KZ] Current platform framework binary is unavailable: ${CURRENT_BINARY}" >&2
+    exit 1
+fi
+
+if [ -f "${OPPOSE_BINARY}" ] && [ -r "${OPPOSE_BINARY}" ]; then
+    if OPPOSE_FRAMEWORK_PATH=$(resolve_framework_path "${OPPOSE_PRODUCT_FULL_DIR}"); then
+        if xcodebuild -create-xcframework -allow-internal-distribution \
+            -framework "${CURRENT_FRAMEWORK_PATH}" \
+            -framework "${OPPOSE_FRAMEWORK_PATH}" \
+            -output "${XCFRAMEWORK_OUTPUT}"; then
+            exit 0
+        fi
+        echo "warning: [KZ] Failed to create a dual-platform xcframework; falling back to the current platform only: ${OPPOSE_FRAMEWORK_PATH}" >&2
+    else
+        echo "warning: [KZ] Unable to resolve the opposite platform framework; falling back to the current platform only: ${OPPOSE_PRODUCT_FULL_DIR}" >&2
+    fi
+elif [ -d "${OPPOSE_PRODUCT_FULL_DIR}" ]; then
+    echo "warning: [KZ] Opposite platform framework binary is unavailable; falling back to the current platform only: ${OPPOSE_BINARY}" >&2
+fi
+
+if ! create_single_platform_xcframework; then
+    echo "error: [KZ] Failed to create a current-platform xcframework: ${CURRENT_FRAMEWORK_PATH}" >&2
+    exit 1
 fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-kz
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - yixiong