cocoapods-kz 0.0.9 → 0.0.11

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

@@ -27,17 +27,27 @@ 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
+
+    attr_accessor :disable_to_simulator_frameworks
+
     def initialize(native_pod_target)
       @native_pod_target = native_pod_target
       @name = native_pod_target.name
@@ -49,10 +59,14 @@ 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
+      @disable_to_simulator_frameworks = []
 
       native_pod_target.file_accessors.each do |file_accessor|
         file_accessor.kz_pod_target = self
@@ -66,7 +80,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 +92,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 +153,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
@@ -169,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(' ')
@@ -207,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也相同。
@@ -242,23 +266,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 +326,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/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/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/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/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,10 +28,19 @@ 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
                 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
@@ -47,9 +56,16 @@ 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
+                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.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 +90,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 +134,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,12 @@ 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'
+  require 'cocoapods-kz/native/pod_target_integrator'
 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,17 @@
+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
+
+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}")
+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.11
 platform: ruby
 authors:
 - yixiong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2024-08-28 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
@@ -58,24 +59,28 @@ 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
 - 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/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
-- 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