cocoapods-kz 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f2ecfbcbc07e3ac505466898ae1b82fe6daf936bcfc56d7a128c7256a000888
-  data.tar.gz: '07248a9d57a52e6f2948b2d893d7463d8581f90d4bf29104df5d3465f991355c'
+  metadata.gz: c043498bc76c19c7f49d1b6f64f00f10535f3512b9eb85853e213e4faa9b4d1c
+  data.tar.gz: e86ca96c094fb8f90d6434d1ce99421c0d4c2d2bca37b0e91f23639f841ea3df
 SHA512:
-  metadata.gz: b32004addf7c59b259281c83d92fab22dc85d5e7f021992f9a3a86af996d8c3de764885fc6bf8b44b2094716743d9cb45133398f4468733c95def92fba911886
-  data.tar.gz: 4552647daba1c5c5265bc67302e84788a17bed18d6d87c93e70f90c6d3e97d393c342f6109f1f2f43e3a82ad3ab7071168e39df64b4b9ab35f9b3a308d6a06a8
+  metadata.gz: 15a3769ef86e707c147f1d8d0f3b03832c316a895869703e501fdf3efb9f365938548bc73b2db8331624d90c9ba714bb41763755696d42e7e64cf800c80729d0
+  data.tar.gz: 70b54fcc641af9ae839c916568e6af18444dc42d00054fcae859e64c9639b780a52eab7320582c15a1c392245fb0cad1cc43cc91557c4ae8716de04c419a6086

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

@@ -7,8 +7,7 @@ module Pod
         self.summary = 'pod kz clean 用于清理缓存以一些报错文件'
 
         self.description = <<-DESC
-        在pod update过程中由于代码变动，module缓存容易产生签名过期的问题，部分属性文件，跳转也会存在路径不对的情况，需要清理老旧缓存文件，
-        让Xcode重新生成
+        在pod update过程中由于代码变动，module缓存容易产生签名过期的问题，部分属性文件，跳转也会存在路径不对的情况，需要清理老旧缓存文件，让Xcode重新生成
         DESC
 
         self.arguments = [
@@ -17,42 +16,50 @@ module Pod
 
         def self.options
           [
-            %w[--xcode 清除module缓存与头文件索引问题],
+            ["--xcode", "清除module缓存与头文件索引问题"],
+            ["--framework", "清除所有自生成本地缓存的framework"],
           ]
         end
 
         def initialize(argv)
-          clean_xcode = argv.flag?('xcode')
-          banner! unless clean_xcode
+          @clean_xcode = argv.flag?('xcode')
+          @clean_framework = argv.flag?('framework')
+          banner! unless @clean_xcode || @clean_framework
 
           super
         end
 
         def run
-          xcodeproj_path = Pathname.new(Dir[Pod::Config.instance.installation_root + "*.xcodeproj"].first)
-          return unless xcodeproj_path
+          if @clean_xcode
+            xcodeproj_path = Pathname.new(Dir[Pod::Config.instance.installation_root + "*.xcodeproj"].first)
+            return unless xcodeproj_path
 
-          xcode_derived_data_path = Pathname.new(Dir.home + "/Library/Developer/Xcode/DerivedData")
-          module_cache_noindex_path = xcode_derived_data_path + "ModuleCache.noindex"
-          FileUtils.rm_rf(module_cache_noindex_path) if module_cache_noindex_path.exist?
+            xcode_derived_data_path = Pathname.new(Dir.home + "/Library/Developer/Xcode/DerivedData")
+            module_cache_noindex_path = xcode_derived_data_path + "ModuleCache.noindex"
+            FileUtils.rm_rf(module_cache_noindex_path) if module_cache_noindex_path.exist?
 
-          project_name = xcodeproj_path.basename.to_s.split(".").first
-          Dir.foreach(xcode_derived_data_path) do |file_name|
-            next if file_name == '.' || file_name == '..' || file_name == '.DS_Store'
+            project_name = xcodeproj_path.basename.to_s.split(".").first
+            Dir.foreach(xcode_derived_data_path) do |file_name|
+              next if file_name == '.' || file_name == '..' || file_name == '.DS_Store'
 
-            if file_name.start_with?(project_name)
-              project_path = xcode_derived_data_path + file_name
-              index_noindex_path = project_path + "Index.noindex"
-              FileUtils.rm_rf(index_noindex_path) if index_noindex_path.exist?
+              if file_name.start_with?(project_name)
+                project_path = xcode_derived_data_path + file_name
+                index_noindex_path = project_path + "Index.noindex"
+                FileUtils.rm_rf(index_noindex_path) if index_noindex_path.exist?
+              end
+            end
+
+            default_xcode_path = Pathname.new('/Applications/Xcode.app')
+            if default_xcode_path.exist?
+              system("osascript -e 'quit app \"Xcode\"'")
+              sleep 1
+              workspace_path = Dir[Pod::Config.instance.installation_root + "*.xcworkspace"].first
+              system("open \"#{workspace_path}\"")
             end
           end
 
-          default_xcode_path = Pathname.new('/Applications/Xcode.app')
-          if default_xcode_path.exist?
-            system("osascript -e 'quit app \"Xcode\"'")
-            sleep 1
-            workspace_path = Dir[Pod::Config.instance.installation_root + "*.xcworkspace"].first
-            system("open \"#{workspace_path}\"")
+          if @clean_framework
+            FileUtils.rm_r(KZ::KZ_POD_CONFIG_ROOT) if File.exist?(KZ::KZ_POD_CONFIG_ROOT)
           end
         end
       end

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

@@ -22,14 +22,16 @@ module Pod
             ['--framework', "后面需要跟上pod名(多个pod，使用英文逗号隔开)，支持追加*匹配任意内容"],
             ['--code', "后面需要跟上pod名(多个pod，使用英文逗号隔开)，支持追加*匹配任意内容"],
             ['--debug', "debug模式，会打印调试日志或生成调试文件"],
-            ['--no-framework-update', "build后不再生成frameowrk"]
+            ['--framework-update', "build后不再生成frameowrk"],
+            ['--arm64-simulator', "适配模拟器的arm64模式，会自动将只支持真机arm64的framework转成arm64模式"]
           ].concat(super).reject { |(name, _)| name == '--no-repo-update' }
         end
 
         def initialize(argv)
           use_code_tag = argv.flag?('code')
           use_framework_tag = argv.flag?('framework')
-          banner! if (use_code_tag && use_framework_tag) || (!use_code_tag && !use_framework_tag && !argv.empty?)
+          banner! unless isOptionsArgvFlag(argv.options.keys)
+          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')
@@ -37,12 +39,20 @@ module Pod
             KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
           end
           KZ::KZGlobalHelper.instance.debug = true if argv.flag?('debug')
-          KZ::KZGlobalHelper.instance.disable_generate_framework = true if argv.flag?('framework-update') != nil
+          KZ::KZGlobalHelper.instance.arm64_simulator = true if argv.flag?('arm64-simulator')
+          framework_update = argv.flag?('framework-update')
+          KZ::KZGlobalHelper.instance.disable_generate_framework = true if (framework_update != nil && framework_update == false)
 
           super
           @additional_args = argv.remainder!
         end
 
+        def isOptionsArgvFlag(all_flags)
+          return true if all_flags.empty?
+          supported_flags = ["repo-update", "deployment", "clean-install", "code", "framework", "debug", "framework-update", "arm64-simulator"]
+          return (all_flags & supported_flags) == all_flags
+        end
+
         def run
           KZ::KZGlobalHelper.instance.prepare
           install = Pod::Command::Install.new(CLAide::ARGV.new([*@additional_args]))

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

@@ -22,14 +22,16 @@ module Pod
             ['--framework', "后面需要跟上pod名(多个pod，使用英文逗号隔开)，支持追加*匹配任意内容"],
             ['--code', "后面需要跟上pod名(多个pod，使用英文逗号隔开)，支持追加*匹配任意内容"],
             ['--debug', "debug模式，会打印调试日志或生成调试文件"],
-            ['--no-framework-update', "build后不再生成frameowrk"]
+            ['--no-framework-update', "build后不再生成frameowrk"],
+            ['--arm64-simulator', "适配模拟器的arm64模式，会自动将只支持真机arm64的framework转成arm64模式"]
           ].concat(super)
         end
 
         def initialize(argv)
           use_code_tag = argv.flag?('code')
           use_framework_tag = argv.flag?('framework')
-          banner! if (use_code_tag && use_framework_tag) || (!use_code_tag && !use_framework_tag && !argv.empty?)
+          banner! unless isOptionsArgvFlag(argv.options.keys)
+          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')
@@ -37,12 +39,20 @@ module Pod
             KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
           end
           KZ::KZGlobalHelper.instance.debug = true if argv.flag?('debug')
-          KZ::KZGlobalHelper.instance.disable_generate_framework = true if argv.flag?('framework-update') != nil
+          KZ::KZGlobalHelper.instance.arm64_simulator = true if argv.flag?('arm64-simulator')
+          framework_update = argv.flag?('framework-update')
+          KZ::KZGlobalHelper.instance.disable_generate_framework = true if (framework_update != nil && framework_update == false)
 
           super
           @additional_args = argv.remainder!
         end
 
+        def isOptionsArgvFlag(all_flags)
+          return true if all_flags.empty?
+          supported_flags = ["sources", "exclude-pods", "clean-install", "code", "framework", "debug", "framework-update", "arm64-simulator"]
+          return (all_flags & supported_flags) == all_flags
+        end
+
         def run
           KZ::KZGlobalHelper.instance.prepare
           update = Pod::Command::Update.new(CLAide::ARGV.new([*@additional_args]))

data/lib/cocoapods-kz/gem_version.rb

@@ -1,5 +1,5 @@
 module CocoapodsKz
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end
 
 module Pod

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

@@ -1,6 +1,8 @@
 require_relative 'kz_pod_target'
 require_relative 'kz_global_helper'
 require_relative 'kz_config_result'
+require 'tmpdir'
+require_relative 'kz_log'
 
 module KZ
   class KZFrameworkManager
@@ -48,5 +50,169 @@ module KZ
       @@all_resources_cache_info
     end
 
+    def self.handle_origin_framework(origin_frameworks, kz_pod_target)
+      new_frameworks = []
+      destination_path = kz_pod_target.pod_config_cache_path(false, true)
+      origin_frameworks.each do |origin_framework_path|
+        if kz_pod_target.disable_to_simulator_frameworks.include?(origin_framework_path)
+          new_frameworks.append(origin_framework_path)
+        else
+          new_framework_path = self.convert_arm64_to_simulator(origin_framework_path, destination_path)
+          if new_framework_path == origin_framework_path
+            kz_pod_target.disable_to_simulator_frameworks.append(origin_framework_path)
+          end
+          new_frameworks.append(new_framework_path)
+        end
+      end
+      new_frameworks
+    end
+
+    def self.convert_arm64_to_simulator(origin_framework_path, destination_path)
+      framework_name = origin_framework_path.basename.to_s
+      if framework_name.end_with?(".framework")
+        framework_basename = framework_name.chomp(".framework")
+        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)
+          return xcframework_path
+        else
+          return origin_framework_path
+        end
+      elsif framework_name.end_with?(".xcframework")
+        framework_basename = framework_name.chomp(".xcframework")
+        xcframework_path = destination_path + "#{framework_basename}.xcframework"
+        return xcframework_path if File.exist?(xcframework_path)
+
+        info_plist_path = origin_framework_path + "Info.plist"
+        return origin_framework_path unless File.exist?(info_plist_path)
+
+        info_plist = Xcodeproj::Plist.read_from_path(info_plist_path)
+        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
+          end
+        end
+
+        # 找到真机arm64 framework与模拟器x86_64 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"]
+            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
+          return origin_framework_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)
+      tempdir = Pathname(Dir.mktmpdir)
+      arm64_path = tempdir + "arm64"
+      FileUtils.mkdir_p(arm64_path)
+      arm64_framework_path = arm64_path + "#{framework_basename}.framework"
+      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}")
+      end
+
+      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)
+      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}")
+      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)
+        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"
+        reach_cmd_tag = false
+        xcrun_vtool_show_result.each do |line|
+          reach_cmd_tag = false if line.start_with?("Load command")
+
+          line_infos = line.lstrip.split
+          next unless  line_infos.count == 2
+
+          if line_infos.first == "cmd" && line_infos.last == "LC_VERSION_MIN_IPHONEOS"
+            reach_cmd_tag = true
+          end
+
+          if reach_cmd_tag
+            if line_infos.include?("sdk")
+              framework_sdk_version = line_infos.last
+            elsif line_infos.include?("version")
+              framework_deployment_version = line_infos.last
+            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}")
+        unless xcrun_vtool_set_result
+          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
+          system("for file in #{ar_x_path}/*.o; do #{ARM64_TO_SIMULATOR_EXECUTE_PATH} $file; done")
+          system("ar crv #{temp_framwork_exe_path} #{ar_x_path}/*.o &> /dev/null")
+        else
+          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}")
+      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}")
+      FileUtils.rm_r(tempdir)
+
+      return true
+    end
+
+    def self.is_dynamic_library?(file_path)
+      file_result = `file -b #{file_path}`
+      return file_result.include?("dynamically linked shared library")
+    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")
+    end
+
   end
 end

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

@@ -108,6 +108,8 @@ module KZ
 
         if all_repair_hmap_info.count > 0
           hmap_cache_path = kz_pod_target.pod_config_cache_path(false)
+          FileUtils.mkdir_p(hmap_cache_path) unless File.exist?(hmap_cache_path)
+
           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"
         end
@@ -117,6 +119,8 @@ module KZ
           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)
+            FileUtils.mkdir_p(hmap_cache_path) unless File.exist?(hmap_cache_path)
+
             save_hmap_file(private_hamp_info, hmap_cache_path, target_name)
             kz_pod_target.private_header_search_path = hmap_cache_path + "#{target_name}.hmap"
           end
@@ -141,13 +145,14 @@ module KZ
 
     def clean_hmap_cache(kz_pod_target)
       hmap_cache_path = kz_pod_target.pod_config_cache_path(false)
+
       Dir.foreach(hmap_cache_path) do |file_name|
         next if file_name == '.' || file_name == '..' || file_name == '.DS_Store'
 
         if file_name.end_with?(".hmap", ".json")
           FileUtils.rm(hmap_cache_path + file_name) if File.exist?(hmap_cache_path + file_name)
         end
-      end
+      end if File.exist?(hmap_cache_path)
     end
 
     def repair_hmap_info(kz_pod_target)

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

@@ -18,6 +18,7 @@ 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_XML_BUILD_PATH = KZ_POD_CONFIG_SUPPORT_FILES + 'kz_xml_build.sh'
   KZ_LOCK_FILE_PATH = KZ_POD_CONFIG_ROOT + 'KZConfigLock'
@@ -48,6 +49,8 @@ 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
 
     private_class_method :new
 
@@ -60,6 +63,15 @@ 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
+    end
+
+    def debug=(value)
+      @debug = value
+      if debug
+        @debug_shell_log_tag = ""
+      end
     end
 
     @@instance = nil

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

@@ -0,0 +1,11 @@
+module KZ
+
+  class KZLog
+    def self.log(logStr)
+      if KZGlobalHelper.instance.debug
+        puts logStr
+      end
+    end
+  end
+end
+

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

@@ -46,6 +46,8 @@ module KZ
 
     attr_accessor :use_modulemap
 
+    attr_accessor :disable_to_simulator_frameworks
+
     def initialize(native_pod_target)
       @native_pod_target = native_pod_target
       @name = native_pod_target.name
@@ -64,6 +66,7 @@ module KZ
       @use_local_private_headers_path = false
       @force_load = false
       @use_modulemap = true
+      @disable_to_simulator_frameworks = []
 
       native_pod_target.file_accessors.each do |file_accessor|
         file_accessor.kz_pod_target = self
@@ -188,6 +191,8 @@ module KZ
 
     # 直接用于配置HEADER_SEARCH_PATHS
     def header_search_paths(custom_paths)
+      return '' unless current_should_build?
+
       header_search_paths = ''
       header_search_paths = KZ.deal_path_for_xcconfig(@private_header_search_path, true) if @private_header_search_path
       repair_header_search_paths = self.all_repair_header_search_paths.join(' ')
@@ -226,11 +231,11 @@ module KZ
     end
 
     # 获取target对应的配置根目录，部分文件需要依赖版本进行存储
-    def pod_config_cache_path(concat_version)
-      kz_target_framework_folder = KZ_POD_CONFIG_POD_TARGETS + @name
-      kz_target_framework_folder += @version if concat_version
-      FileUtils.mkdir_p(kz_target_framework_folder) unless File.exist?(kz_target_framework_folder) || concat_version
-      kz_target_framework_folder
+    def pod_config_cache_path(concat_version, vendored_framework = false)
+      kz_target_config_folder = KZ_POD_CONFIG_POD_TARGETS + @name
+      kz_target_config_folder += "vendored_framework" if vendored_framework
+      kz_target_config_folder += @version if concat_version
+      kz_target_config_folder
     end
 
     # 获取target中的module name，默认为product_module_name与target.name也相同。

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

@@ -72,10 +72,15 @@ module Pod
 
       alias_method :origin_vendored_frameworks, :vendored_frameworks
       def vendored_frameworks
-        result = KZ::KZGlobalHelper.instance.pod_config_result_with_target(self.kz_pod_target)
-        if !self.spec.test_specification && result
+        if self.kz_pod_target
           frameworks = origin_vendored_frameworks
-          frameworks.concat(result.get_framework_paths)
+          if KZ::KZGlobalHelper.instance.arm64_simulator && frameworks.count > 0
+            frameworks = KZ::KZFrameworkManager.handle_origin_framework(frameworks, self.kz_pod_target)
+          end
+          result = KZ::KZGlobalHelper.instance.pod_config_result_with_target(self.kz_pod_target)
+          if !self.spec.test_specification && result
+            frameworks.concat(result.get_framework_paths)
+          end
           frameworks
         else
           origin_vendored_frameworks

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

@@ -0,0 +1,62 @@
+module Pod
+  class Installer
+    class Xcode
+      class PodsProjectGenerator
+
+        class PodTargetIntegrator
+          $global_output_paths_avoid_duplicate = []
+
+          def add_copy_xcframeworks_script_phase(native_target)
+            script_path = "${PODS_ROOT}/#{target.copy_xcframeworks_script_path.relative_path_from(target.sandbox.root)}"
+
+            input_paths_by_config = {}
+            output_paths_by_config = {}
+
+            xcframeworks = target.xcframeworks.values.flatten
+
+            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)}"
+              input_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(input_file_list_path, input_file_list_relative_path)
+              input_paths = input_paths_by_config[input_paths_key] = [script_path]
+
+              framework_paths = xcframeworks.map { |xcf| "${PODS_ROOT}/#{xcf.path.relative_path_from(target.sandbox.root)}" }
+              input_paths.concat framework_paths
+
+              output_file_list_path = target.copy_xcframeworks_script_output_files_path
+              output_file_list_relative_path = "${PODS_ROOT}/#{output_file_list_path.relative_path_from(target.sandbox.root)}"
+              output_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(output_file_list_path, output_file_list_relative_path)
+              output_paths_by_config[output_paths_key] = xcframeworks.map do |xcf|
+                "#{Target::BuildSettings::XCFRAMEWORKS_BUILD_DIR_VARIABLE}/#{xcf.target_name}/#{xcf.name}.framework"
+              end
+            end
+
+            if xcframeworks.empty?
+              UserProjectIntegrator::TargetIntegrator.remove_copy_xcframeworks_script_phase_from_target(native_target)
+            else
+              if target_installation_result.target.scope_suffix
+                output_paths_by_config.each do |key, value|
+                  if value && value.count > 0
+                    need_remove_paths = []
+                    value.each do |path|
+                      if $global_output_paths_avoid_duplicate.include?(path)
+                        need_remove_paths.append(path)
+                      else
+                        $global_output_paths_avoid_duplicate.append(path)
+                      end
+                    end
+                    need_remove_paths.each do |need_remove_path|
+                      value.delete(need_remove_path)
+                    end if need_remove_paths.count > 0
+                  end
+                end
+              end
+              UserProjectIntegrator::TargetIntegrator.create_or_update_copy_xcframeworks_script_phase_to_target(
+                native_target, script_path, input_paths_by_config, output_paths_by_config)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -37,6 +37,10 @@ module Pod
                 end
                 xcconfig.attributes['HEADER_SEARCH_PATHS'] = main_hamp_search_path
                 xcconfig.attributes['USE_HEADERMAP'] = 'NO'
+                if KZ::KZGlobalHelper.instance.arm64_simulator
+                  xcconfig.attributes.delete("EXCLUDED_ARCHS[sdk=iphonesimulator*]")
+                  xcconfig.attributes['VALID_ARCHS'] = 'arm64 arm64_32 x86_64'
+                end
                 
                 kz_update_xcconfig_file(xcconfig, path)
                 return
@@ -55,6 +59,10 @@ module Pod
                 if kz_pod_target.force_load
                   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['VALID_ARCHS'] = 'arm64 arm64_32 x86_64'
+                end
 
                 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?)

data/lib/cocoapods-kz/native.rb

@@ -12,4 +12,5 @@ if Pod.match_version?('~> 1.11')
   require 'cocoapods-kz/native/pod_target_installer'
   require 'cocoapods-kz/native/specification'
   require 'cocoapods-kz/native/pods_project_writer'
+  require 'cocoapods-kz/native/pod_target_integrator'
 end

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

@@ -8,6 +8,8 @@ if !File.exist?(current_pods_pbxproj_path) || !FileUtils.compare_file(current_po
   FileUtils.cp_r(temp_pods_pbxproj_path, current_pods_pbxproj_path)
 end
 
+FileUtils.rm_r(Pathname(temp_pods_pbxproj_path).dirname)
+
 xcode_running = system("ps aux | grep '[X]code' > /dev/null 2>&1")
 if xcode_running
   system("touch #{current_pods_pbxproj_path}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-kz
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - yixiong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-20 00:00:00.000000000 Z
+date: 2024-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,7 @@ files:
 - lib/cocoapods-kz/helpers/kz_framework_manager.rb
 - lib/cocoapods-kz/helpers/kz_generator.rb
 - lib/cocoapods-kz/helpers/kz_global_helper.rb
+- lib/cocoapods-kz/helpers/kz_log.rb
 - lib/cocoapods-kz/helpers/kz_pod_target.rb
 - lib/cocoapods-kz/helpers/repair_dynamic_swift.rb
 - lib/cocoapods-kz/helpers/repair_module_import.rb
@@ -69,11 +70,13 @@ files:
 - 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/pod_target_integrator.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/arm64ToSimulator
 - lib/cocoapods-kz/resources/hmap
 - lib/cocoapods-kz/resources/kz_fix_force_load_exe.sh
 - lib/cocoapods-kz/resources/kz_generator_framework.sh