cocoapods-kz 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0adb9cf2f4e1a78b6abe18abd9fae6e436a4c7fad05acc3bddf755741c629ac3
-  data.tar.gz: f19287aa386c7a8dc5e35c7c968e4561f2d1efd5e89e9c442713d44c1b33efc9
+  metadata.gz: eb92acb138de5800f2049f30ca3347f49b1bc5952c484c9b5b97d32f80fe9106
+  data.tar.gz: 400c7a82a87498befbeb380b8e1970a8b79fbd8349db1f02dfa4eaad031e31fc
 SHA512:
-  metadata.gz: 3271c951e3d57b6051ab4d50256f9856fe01b5249406a55add7aa82d4ac480e83595d8718767e0b3a23c5294ec36ff9c0a381ebd2ca3dd714b20e066ea366c45
-  data.tar.gz: 1c3e23c479465b7fcaedee7976a8407cdfff7febb40a38c77dea9f08126f69cf1d8e8aa6956b35a15b267c1a8203951498d92dc792095857af7e0822393945f5
+  metadata.gz: 1e0d474d119d503d083458b5460a88f05b4e66d4bd65bbbd81b4c5fcef0e403eb515218b76f6883001c88743e20ce93041ef623a71eddb030bb76bfa3434a2a1
+  data.tar.gz: 21c976ce340e46d45e51869f06b7ea13b8277fd5c52aa8b62e9d4533665b4179c983c63dbd37798ea29368246aa7c1fb9e09d541f6e861d8884cfe46ad0315a1

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

@@ -0,0 +1,61 @@
+require 'fileutils'
+
+module Pod
+  class Command
+    class Kz < Command
+      class Clean < Kz
+        self.summary = 'pod kz clean 用于清理缓存以一些报错文件'
+
+        self.description = <<-DESC
+        在pod update过程中由于代码变动，module缓存容易产生签名过期的问题，部分属性文件，跳转也会存在路径不对的情况，需要清理老旧缓存文件，
+        让Xcode重新生成
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('1', false)
+        ]
+
+        def self.options
+          [
+            %w[--xcode 清除module缓存与头文件索引问题],
+          ]
+        end
+
+        def initialize(argv)
+          clean_xcode = argv.flag?('xcode')
+          banner! unless clean_xcode
+
+          super
+        end
+
+        def run
+          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?
+
+          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?
+            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
+      end
+    end
+  end
+end

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

@@ -8,9 +8,9 @@ module Pod
         self.summary = 'pod kz install，用于指定pod是否开启framework模式'
 
         self.description = <<-DESC
-        pod kz install 通过 --kz-framework与指定pod名(多个pod，使用英文逗号隔开)，尝试开启这些pod的framework模式，如果framwork不存在则仍然会使用code模式
-        通过 --kz-code 与指定pod名(多个pod，使用英文逗号隔开)，尝试开启这些pod的code模式，其余pod将尝试使用framework模式，如果framwork不存在则仍然会使用code模式
-        如果不添加任何参数，则默认所有pod为code模式，--kz-framework与--kz-code不能同时使用
+        pod kz install 通过 --framework与指定pod名(多个pod，使用英文逗号隔开)，尝试开启这些pod的framework模式，如果framwork不存在则仍然会使用code模式
+        通过 --code 与指定pod名(多个pod，使用英文逗号隔开)，尝试开启这些pod的code模式，其余pod将尝试使用framework模式，如果framwork不存在则仍然会使用code模式
+        如果不添加任何参数，则默认所有pod为code模式，--framework与--code不能同时使用
         DESC
 
         def self.options
@@ -29,7 +29,8 @@ module Pod
         def initialize(argv)
           use_code_tag = argv.flag?('code')
           use_framework_tag = argv.flag?('framework')
-          help! if use_code_tag && use_framework_tag
+          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')
             KZ::KZGlobalHelper.instance.kz_pod_enable = true

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

@@ -1,6 +1,7 @@
 require_relative 'install'
 require_relative 'update'
 require_relative 'repair'
+require_relative 'clean'
 
 module Pod
   class Command

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

@@ -14,15 +14,16 @@ module Pod
         def self.options
           [
             ['--module-import', "指定组件名(只针对开发组件)，修复该组件所有文件头文件导入方式，壳工程使用“Main”，如果不指定，默认对所有开发组件进行修复"],
-            ['--dynamic-swift', "指定组件名(只针对开发组件)，将该组件中所有swift文件添加OC特性，壳工程使用“Main”，如果不指定，默认对所有开发组件进行修复"]
+            ['--dynamic-swift', "指定组件名(只针对开发组件)，将该组件中所有swift文件添加OC特性，壳工程使用“Main”，如果不指定，默认对所有开发组件进行修复"],
+            ['--private-hmap', "重新生成组件私有hamp"],
           ]
         end
 
         def initialize(argv)
-          help! if argv.arguments == 0
           @repair_module_import = argv.flag?('module-import')
           @repair_dynamic_swift = argv.flag?('dynamic-swift')
-          help! if !@repair_module_import && !@repair_dynamic_swift
+          @repair_private_hmap = argv.flag?('private-hmap')
+          banner! unless @repair_module_import || @repair_dynamic_swift || @repair_private_hmap
 
           KZ::KZGlobalHelper.instance.analyze_special_parameters(true, false, argv.arguments!)
           KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
@@ -33,12 +34,14 @@ module Pod
         def run
           installer = installer_for_config
           installer.prepare
-          installer.resolve_dependencies.analyze
+          installer.resolve_dependencies
 
           if @repair_dynamic_swift
             KZ::KZSwiftAttachOCFeature.new.repair
-          else @repair_module_import
+          elsif @repair_module_import
             KZ::KZRepairModuleImport.new(installer.aggregate_targets.first.user_project).repair
+          else @repair_private_hmap
+            KZ::KZGlobalHelper.instance.kz_generator.create_hamp
           end
         end
       end

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

@@ -7,9 +7,9 @@ module Pod
         self.summary = 'pod kz update，用于指定pod是否开启framework模式'
 
         self.description = <<-DESC
-        pod kz update 通过 --kz-framework与指定pod名(多个pod，使用英文逗号隔开)，尝试开启这些pod的framework模式，如果framwork不存在则仍然会使用code模式
-        通过 --kz-code 与指定pod名(多个pod，使用英文逗号隔开)，尝试开启这些pod的code模式，其余pod将尝试使用framework模式，如果framwork不存在则仍然会使用code模式
-        如果不添加任何参数，则默认所有pod为code模式，--kz-framework与--kz-code不能同时使用
+        pod kz update 通过 --framework与指定pod名(多个pod，使用英文逗号隔开)，尝试开启这些pod的framework模式，如果framwork不存在则仍然会使用code模式
+        通过 --code 与指定pod名(多个pod，使用英文逗号隔开)，尝试开启这些pod的code模式，其余pod将尝试使用framework模式，如果framwork不存在则仍然会使用code模式
+        如果不添加任何参数，则默认所有pod为code模式，--framework与--code不能同时使用
         DESC
 
         def self.options
@@ -29,7 +29,8 @@ module Pod
         def initialize(argv)
           use_code_tag = argv.flag?('code')
           use_framework_tag = argv.flag?('framework')
-          help! if use_code_tag && use_framework_tag
+          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')
             KZ::KZGlobalHelper.instance.kz_pod_enable = true

data/lib/cocoapods-kz/gem_version.rb

@@ -1,5 +1,5 @@
 module CocoapodsKz
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end
 
 module Pod

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

@@ -134,7 +134,7 @@ module KZ
       if File.exist?(KZ_LOCK_FILE_PATH)
         @lock_file ||= JSON.parse(File.read(KZ_LOCK_FILE_PATH))
         pod_lock_config = @lock_file[kz_pod_target.name]
-        return :kz_pod_framework_mode if pod_lock_config['use_framework']
+        return :kz_pod_framework_mode if pod_lock_config && pod_lock_config['use_framework']
       end
       :kz_pod_code_mode
     end

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

@@ -14,7 +14,7 @@ module KZ
     def get_bundle_paths
       bundle_paths = []
       Dir.foreach(@resource_path) do |bundle_name|
-        next if bundle_name == '.' || bundle_name == '..'
+        next if bundle_name == '.' || bundle_name == '..' || bundle_name == '.DS_Store'
 
         bundle_path = @resource_path + bundle_name
         if File.directory?(bundle_path) && bundle_name.end_with?(".bundle")
@@ -27,7 +27,7 @@ module KZ
     def get_framework_paths
       framework_paths = []
       Dir.foreach(@resource_path) do |framework_name|
-        next if framework_name == '.' || framework_name == '..'
+        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")

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

@@ -22,18 +22,18 @@ module KZ
       end
 
       Dir.foreach(KZ_POD_CONFIG_ROOT) do |folder_name|
-        next if folder_name == '.' || folder_name == '..'
+        next if folder_name == '.' || folder_name == '..' || folder_name == '.DS_Store'
 
         config_folder = KZ_POD_CONFIG_ROOT + folder_name
         if File.directory?(config_folder)
           Dir.foreach(config_folder) do |version|
-            next if version == '.' || version == '..'
+            next if version == '.' || version == '..' || version == '.DS_Store'
 
             version_folder = config_folder + version
             if File.directory?(version_folder)
               have_framework = false
               Dir.foreach(version_folder) do |file_name|
-                next if file_name == '.' || file_name == '..'
+                next if file_name == '.' || file_name == '..' || file_name == '.DS_Store'
 
                 if file_name.end_with?(".framework") && File.directory?(version_folder + file_name)
                   have_framework = true

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

@@ -2,10 +2,6 @@ require 'xcodeproj'
 require 'fileutils'
 
 module KZ
-  class HmapContentStyle
-    QUOTES_PRIVATE = 1
-    QUOTES_REPAIR = 2
-  end
 
   class KZGenerator
 
@@ -132,7 +128,7 @@ fi}
         need_repair_import_targets = kz_pod_target.repair_import
         if need_repair_import_targets.count > 0
           need_repair_import_targets.each { |need_repair_import_target|
-            repair_hmap_info = get_hmap_info_from(need_repair_import_target, HmapContentStyle::QUOTES_REPAIR)
+            repair_hmap_info = repair_hmap_info(need_repair_import_target)
             all_repair_hmap_info.merge!(repair_hmap_info)
           }
         end
@@ -159,7 +155,7 @@ fi}
 
         # 添加私有头文件引用
         if kz_pod_target.should_build?
-          private_hamp_info = get_hmap_info_from(kz_pod_target, HmapContentStyle::QUOTES_PRIVATE)
+          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)
             save_hmap_file(private_hamp_info, hmap_cache_path, target_name)
@@ -171,7 +167,7 @@ fi}
 
     def traverse_folder(folder_path)
       Dir.foreach(folder_path) do |file_name|
-        next if file_name == '.' || file_name == '..'
+        next if file_name == '.' || file_name == '..' || file_name == '.DS_Store'
 
         file_path = File.join(folder_path, file_name)
         if File.file?(file_path)
@@ -187,7 +183,7 @@ fi}
     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 == '..'
+        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)
@@ -195,11 +191,9 @@ fi}
       end
     end
 
-    def get_hmap_info_from(kz_pod_target, hmap_content_style)
+    def repair_hmap_info(kz_pod_target)
       header_paths = kz_pod_target.public_headers
-      header_paths = kz_pod_target.all_headers if hmap_content_style == HmapContentStyle::QUOTES_PRIVATE
-      hmap_info = {}
-      header_paths.each do |header_pathname|
+      header_paths.each_with_object({}) do |header_pathname, hmap_info|
         header_pathname_basename = header_pathname.basename.to_s
 
         header_hmap_value_quotes = {}
@@ -207,48 +201,65 @@ fi}
         header_hmap_value_quotes['prefix'] = header_pathname.dirname.to_s + '/'
         hmap_info[header_pathname_basename] = header_hmap_value_quotes
 
-        if hmap_content_style == HmapContentStyle::QUOTES_PRIVATE
-          # pch
-          pchfile_path = kz_pod_target.prefix_header_path
-          if pchfile_path.exist?
-            suffix = pchfile_path.basename.to_s
-            hmap_info[suffix] = { 'suffix' => suffix, 'prefix' => "#{pchfile_path.dirname.to_s}/" }
+        header_hmap_value_slash = {}
+        header_hmap_value_slash['suffix'] = header_pathname_basename
+        prefix_name = kz_pod_target.product_basename
+        if header_pathname.dirname.to_s.include?('.framework')
+          header_pathname.dirname.to_s.split('/').each do |name|
+            if name.include?('.framework')
+              prefix_name = name.split('.').first
+            end
           end
+        end
+        header_hmap_value_slash['prefix'] = prefix_name + '/'
+        hmap_info[header_pathname_basename] = header_hmap_value_slash
+      end
+    end
 
-          unless kz_pod_target.is_dev_pod
-            # 个别第三方在使用自己组件文件时，会使用#import <xx/xx.h>的方式
-            hmap_info[kz_pod_target.product_basename + '/' + header_pathname_basename] = header_hmap_value_quotes
-          end
+    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?
+        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)
+        end
+        kz_pod_target.use_local_private_headers_path = true
+      end
+      header_paths.each_with_object({}) do |header_pathname, hmap_info|
+        header_pathname_basename = header_pathname.basename.to_s
 
-          if kz_pod_target.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}/" }
-
-            # 以SPBoss为例，在混编模式中，SPBoss-Swift.h会使用#import <SPBoss/SPBoss.h>方式导入swift需要使用的OC头文件
-            # SPBoss中头文件会存在当前组件与framework的Headers中，有两份。SPBoss-Swift.h只在framework中
-            # 编译默认从SPBoss-Swift.h找SPBoss.h，然后找SPBoss.h中的头文件也都会在framework中寻在，会造成与当前组件头文件重复
-            # 需要重新将#import <SPBoss/SPBoss.h>方式修复为寻找当前组件中的SPBoss.h文件，而不是framework中的SPBoss.h
-            if header_pathname_basename == "#{kz_pod_target.name}.h"
-              hmap_info[kz_pod_target.name + '/' + header_pathname_basename] = header_hmap_value_quotes
-            end
-          end
-        elsif hmap_content_style == HmapContentStyle::QUOTES_REPAIR
-          header_hmap_value_slash = {}
-          header_hmap_value_slash['suffix'] = header_pathname_basename
-          prefix_name = kz_pod_target.product_basename
-          if header_pathname.dirname.to_s.include?('.framework')
-            header_pathname.dirname.to_s.split('/').each do |name|
-              if name.include?('.framework')
-                prefix_name = name.split('.').first
-              end
-            end
+        header_hmap_value_quotes = {}
+        header_hmap_value_quotes['suffix'] = header_pathname_basename
+        header_hmap_value_quotes['prefix'] = header_pathname.dirname.to_s + '/'
+        hmap_info[header_pathname_basename] = header_hmap_value_quotes
+
+        # pch
+        pchfile_path = kz_pod_target.prefix_header_path
+        if pchfile_path.exist?
+          suffix = pchfile_path.basename.to_s
+          hmap_info[suffix] = { 'suffix' => suffix, 'prefix' => "#{pchfile_path.dirname.to_s}/" }
+        end
+
+        unless kz_pod_target.is_dev_pod
+          # 个别第三方在使用自己组件文件时，会使用#import <xx/xx.h>的方式
+          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
+          # 修改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}/" }
+
+          # 以SPBoss为例，在混编模式中，SPBoss-Swift.h会使用#import <SPBoss/SPBoss.h>方式导入swift需要使用的OC头文件
+          # SPBoss中头文件会存在当前组件与framework的Headers中，有两份。SPBoss-Swift.h只在framework中
+          # 编译默认从SPBoss-Swift.h找SPBoss.h，然后找SPBoss.h中的头文件也都会在framework中寻在，会造成与当前组件头文件重复
+          # 需要重新将#import <SPBoss/SPBoss.h>方式修复为寻找当前组件中的SPBoss.h文件，而不是framework中的SPBoss.h
+          if header_pathname_basename == "#{kz_pod_target.name}.h"
+            hmap_info[kz_pod_target.name + '/' + header_pathname_basename] = header_hmap_value_quotes
           end
-          header_hmap_value_slash['prefix'] = prefix_name + '/'
-          hmap_info[header_pathname_basename] = header_hmap_value_slash
         end
       end
-      hmap_info
     end
 
     def save_hmap_file(hmap_hash, save_path, file_name)

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

@@ -56,13 +56,12 @@ module KZ
 
     @@instance = nil
     def self.instance
+      FileUtils.mkdir_p(KZ_POD_CONFIG_ROOT) unless File.exist?(KZ_POD_CONFIG_ROOT)
       @@instance ||= new
     end
 
     def prepare
       if Pod::Config.instance.podfile && Pod::Config.instance.podfile.plugins.has_key?("cocoapods-kz")
-        FileUtils.mkdir_p(KZ_POD_CONFIG_ROOT) unless File.exist?(KZ_POD_CONFIG_ROOT)
-
         flex_compiler_de_path = KZ_POD_CONFIG_ROOT + 'FlexCompiler'
         FileUtils.rm(flex_compiler_de_path) if File.exist?(flex_compiler_de_path)
         FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler', KZ_POD_CONFIG_ROOT)
@@ -70,6 +69,7 @@ module KZ
         FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/kz_merge_swift_h.rb', KZ_MERGE_SWIFT_H_PATH)
 
         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

@@ -36,6 +36,8 @@ module KZ
     # 当手动修改PRODUCT_NAME之后，#import<xx/xxx.h>需要修复为原使用方式，使用hmap进行映射
     attr_accessor :need_repair_module_import
 
+    attr_accessor :use_local_private_headers_path
+
     def initialize(native_pod_target)
       @native_pod_target = native_pod_target
       @name = native_pod_target.name
@@ -50,6 +52,7 @@ module KZ
       @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
 
       native_pod_target.file_accessors.each do |file_accessor|
         file_accessor.kz_pod_target = self
@@ -63,31 +66,30 @@ module KZ
     end
 
     def all_headers
-      return @_all_headers if @_all_headers != nil
-
-      all_headers = []
-      native_pod_target.file_accessors.each do |file_accessor|
-        next if file_accessor.spec.test_specification
-
-        all_headers.concat(file_accessor.kz_headers)
-      end
-
-      @_all_headers = all_headers
-      @_all_headers
+      return [] unless have_download_pod?
+      @all_headers ||= begin
+                         all_headers = []
+                         native_pod_target.file_accessors.each do |file_accessor|
+                           next if file_accessor.spec.test_specification
+
+                           all_headers.concat(file_accessor.kz_headers)
+                         end
+                         all_headers
+                       end
     end
 
     def public_headers
-      return @_public_headers if @_public_headers != nil
-
-      public_headers = []
-      native_pod_target.file_accessors.each do |file_accessor|
-        next if file_accessor.spec.test_specification
+      return [] unless have_download_pod?
 
-        public_headers.concat(file_accessor.kz_public_headers)
-      end
+      @public_headers ||= begin
+                            public_headers = []
+                            native_pod_target.file_accessors.each do |file_accessor|
+                              next if file_accessor.spec.test_specification
 
-      @_public_headers = public_headers
-      @_public_headers
+                              public_headers.concat(file_accessor.kz_public_headers)
+                            end
+                            public_headers
+                          end
     end
 
     # 重些config_pod_mode的set方法，kz_pod_framework_mode优先级最高
@@ -173,6 +175,9 @@ module KZ
       if repair_header_search_paths.length > 0
         header_search_paths += (' ' + repair_header_search_paths)
       end
+      if @use_local_private_headers_path
+        header_search_paths += (' ' + KZ.deal_path_for_xcconfig(local_private_headers_path, true))
+      end
       header_search_paths
     end
 
@@ -237,8 +242,25 @@ module KZ
       @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)
+    end
+
     def should_build?
-      @native_pod_target.should_build?
+      have_download_pod? ? @native_pod_target.should_build? : false
+    end
+
+    def uses_swift?
+      @native_pod_target.uses_swift?
+    end
+
+    def local_private_headers_path
+      @local_private_headers_path ||= begin
+                                        path = KZ_POD_CONFIG_ROOT + @name + "Headers"
+                                        FileUtils.mkdir_p(path) unless File.exist?(path)
+                                        path
+                                      end
     end
 
   end

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

@@ -27,7 +27,7 @@ module Pod
                     if kz_pod_target.repair_header_search_path
                       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)
+                    add_repair_modulemap(xcconfig, kz_pod_target.all_repair_modulemap_paths, self.target.uses_swift?)
                   end
                 end
                 xcconfig.attributes['HEADER_SEARCH_PATHS'] = main_hamp_search_path
@@ -50,7 +50,7 @@ module Pod
                 xcconfig.attributes['KZ_FRAMEWORK_CACHE_PATH'] = framework_cache_path
                 xcconfig.attributes['KZ_MERGE_SWIFT_H_PATH'] = KZ::KZGlobalHelper.instance.kz_merge_swift_h_path
 
-                add_repair_modulemap(xcconfig, kz_pod_target.all_repair_modulemap_paths)
+                add_repair_modulemap(xcconfig, kz_pod_target.all_repair_modulemap_paths, kz_pod_target.uses_swift?)
                 kz_update_xcconfig_file(xcconfig, path)
                 return
               end
@@ -58,16 +58,18 @@ module Pod
             origin_update_changed_file(generator, path)
           end
 
-          def add_repair_modulemap(xcconfig, repair_modulemap_paths)
+          def add_repair_modulemap(xcconfig, repair_modulemap_paths, uses_swift = false)
             if repair_modulemap_paths.count > 0
               repair_modulemap_paths.each do |repair_modulemap_path|
                 fmodule_map = ' -fmodule-map-file=' + KZ.deal_path_for_xcconfig(repair_modulemap_path, true)
                 unless xcconfig.attributes['OTHER_CFLAGS'].include?(fmodule_map)
                   xcconfig.attributes['OTHER_CFLAGS'] += fmodule_map
                 end
-                xfmodule_map = ' -Xcc -fmodule-map-file=' + KZ.deal_path_for_xcconfig(repair_modulemap_path, true)
-                unless xcconfig.attributes['OTHER_SWIFT_FLAGS'].include?(xfmodule_map)
-                  xcconfig.attributes['OTHER_SWIFT_FLAGS'] += xfmodule_map
+                if uses_swift
+                  xfmodule_map = ' -Xcc -fmodule-map-file=' + KZ.deal_path_for_xcconfig(repair_modulemap_path, true)
+                  unless xcconfig.attributes['OTHER_SWIFT_FLAGS'].include?(xfmodule_map)
+                    xcconfig.attributes['OTHER_SWIFT_FLAGS'] += xfmodule_map
+                  end
                 end
               end
             end
@@ -107,7 +109,7 @@ module Pod
 
           def check_default_xcode_version_for_ld64
             default_xcode_path = Pathname.new('/Applications/Xcode.app')
-            return false unless File.exist?(default_xcode_path)
+            return false unless default_xcode_path.exist?
 
             xcode_info_plist = default_xcode_path + 'Contents/Info.plist'
             _xcode_info_plist = KZ::KZ_POD_CONFIG_ROOT + 'Xcode_Info.plist'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-kz
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - yixiong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-28 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - lib/cocoapods-kz.rb
 - lib/cocoapods-kz/command.rb
+- lib/cocoapods-kz/command/clean.rb
 - lib/cocoapods-kz/command/install.rb
 - lib/cocoapods-kz/command/kz.rb
 - lib/cocoapods-kz/command/repair.rb