cocoapods-kz 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f8cee909ef575acab6b79cbcc8bb35111b0828bdac5b60ff697e09f72939373
-  data.tar.gz: 71d9afa7f5b11a7e517c4e2a59fcf91d8b1f9f5ff1e55656187fe23468eb86ab
+  metadata.gz: 0adb9cf2f4e1a78b6abe18abd9fae6e436a4c7fad05acc3bddf755741c629ac3
+  data.tar.gz: f19287aa386c7a8dc5e35c7c968e4561f2d1efd5e89e9c442713d44c1b33efc9
 SHA512:
-  metadata.gz: b313218bd5b0dddd59a8f757306c9d1075d4269867b4f092d643fec4d91640d775c496e18ed35936b5a634daf70ed629cd780e55b1962d88ef4707fc5784137b
-  data.tar.gz: 0dfbce6a258f4d94eec260e16856088d9f97533a63f394be0e9cff6ca66e47f4af68048015c0970454b235d72bbd12e55d65054abbd75c000005f484cc656b2b
+  metadata.gz: 3271c951e3d57b6051ab4d50256f9856fe01b5249406a55add7aa82d4ac480e83595d8718767e0b3a23c5294ec36ff9c0a381ebd2ca3dd714b20e066ea366c45
+  data.tar.gz: 1c3e23c479465b7fcaedee7976a8407cdfff7febb40a38c77dea9f08126f69cf1d8e8aa6956b35a15b267c1a8203951498d92dc792095857af7e0822393945f5

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

@@ -31,7 +31,7 @@ module Pod
           use_framework_tag = argv.flag?('framework')
           help! 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.4')
+          if Pod.match_version?('~> 1.11')
             KZ::KZGlobalHelper.instance.kz_pod_enable = true
             KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
           end

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

@@ -31,7 +31,7 @@ module Pod
           use_framework_tag = argv.flag?('framework')
           help! 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.4')
+          if Pod.match_version?('~> 1.11')
             KZ::KZGlobalHelper.instance.kz_pod_enable = true
             KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
           end

data/lib/cocoapods-kz/gem_version.rb

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

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

@@ -45,7 +45,7 @@ module KZ
         kz_pod_target = KZPodTarget.new(native_pod_target)
         is_dev_pod = @development_pods.include?(native_pod_target_name)
         kz_pod_target.is_dev_pod = is_dev_pod
-        kz_pod_target.force_config_pod_mode = get_real_config_pod_mode(kz_pod_target)
+        kz_pod_target.force_config_pod_mode = get_force_config_pod_mode(kz_pod_target)
         if config_pod_mode != :kz_pod_origin_mode && !is_dev_pod
           kz_pod_target.config_pod_mode = config_pod_mode
         else
@@ -67,7 +67,9 @@ module KZ
           kz_dependent_target_info[native_dependent_target.name] = kz_dependent_pod_target if kz_dependent_pod_target
         end
         kz_pod_target.dependent_target_info = kz_dependent_target_info
-        kz_pod_target.add_kz_pod_config(KZGlobalHelper.instance.kz_pod_config[native_pod_target_name]) do |repair_dependent_pod_target_name|
+        kz_pod_config = KZGlobalHelper.instance.kz_pod_config[native_pod_target_name]
+        kz_pod_config = KZGlobalHelper.instance.kz_pod_config[kz_pod_target.root_name] if kz_pod_config == nil
+        kz_pod_target.add_kz_pod_config(kz_pod_config) do |repair_dependent_pod_target_name|
           repair_native_pod_target = get_native_pod_target_with(repair_dependent_pod_target_name)
           repair_kz_pod_target = nil
           if repair_native_pod_target
@@ -95,7 +97,7 @@ module KZ
       kz_pod_targets
     end
 
-    def get_real_config_pod_mode(kz_pod_target)
+    def get_force_config_pod_mode(kz_pod_target)
       if specify_pod_names_contain(kz_pod_target.name)
         return KZGlobalHelper.instance.specify_pod_mode
       end
@@ -107,6 +109,8 @@ module KZ
         specify_pod_names_contain(kz_pod_target.name) ? :kz_pod_framework_mode : :kz_pod_code_mode
       elsif KZGlobalHelper.instance.specify_pod_mode == :kz_pod_code_mode
         specify_pod_names_contain(kz_pod_target.name) ? :kz_pod_code_mode : :kz_pod_framework_mode
+      elsif KZGlobalHelper.instance.specify_pod_mode == :kz_pod_origin_mode
+        use_framework_mode_from_lock_file?(kz_pod_target)
       end
     end
 
@@ -125,5 +129,15 @@ module KZ
         true
       end
     end
+
+    def use_framework_mode_from_lock_file?(kz_pod_target)
+      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']
+      end
+      :kz_pod_code_mode
+    end
+
   end
 end

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

@@ -48,7 +48,19 @@ find "${CURRENT_PRODUCT_DIR}" -iname "*.bundle" | while read -r BUNDLE_FILE; do
 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}/${PRODUCT_NAME}.framework/${PRODUCT_NAME}"
+    lipo -create ${PRODUCT_DIR}/${PRODUCT_NAME} ${PRODUCT_SIMULATOR_DIR}/${PRODUCT_NAME} -output "${KZ_FRAMEWORK_CACHE_PATH}/${FULL_PRODUCT_NAME}/${PRODUCT_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"
+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
                 }
     end
@@ -204,8 +216,8 @@ fi}
           end
 
           unless kz_pod_target.is_dev_pod
-            # 各别第三方在使用自己组件文件时，会使用#import <xx/xx.h>的方式
-            hmap_info[kz_pod_target.name + '/' + header_pathname_basename] = header_hmap_value_quotes
+            # 个别第三方在使用自己组件文件时，会使用#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
@@ -224,7 +236,7 @@ fi}
         elsif hmap_content_style == HmapContentStyle::QUOTES_REPAIR
           header_hmap_value_slash = {}
           header_hmap_value_slash['suffix'] = header_pathname_basename
-          prefix_name = kz_pod_target.name
+          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')

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

@@ -15,6 +15,7 @@ module KZ
   HMAP_EXECUTE_PATH = File.dirname(__FILE__) + '/../resources/hmap'
   FLEX_COMPLIER_PATH = KZ_POD_CONFIG_ROOT + 'FlexCompiler'
   KZ_LOCK_FILE_PATH = KZ_POD_CONFIG_ROOT + 'KZConfigLock'
+  KZ_MERGE_SWIFT_H_PATH = KZ_POD_CONFIG_ROOT + 'kz_merge_swift_h.rb'
 
   def self.deal_path_for_xcconfig(path, add_quotes = false)
     if path.is_a?(String)
@@ -59,15 +60,20 @@ module KZ
     end
 
     def prepare
-      FileUtils.rm(KZ_LOCK_FILE_PATH) if File.exist?(KZ_LOCK_FILE_PATH)
-      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)
-      system("chmod +x #{flex_compiler_de_path}")
-
-      Pod::Config.instance.podfile.use_frameworks!(:linkage => :static) if Pod::Config.instance.podfile
+      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)
+        system("chmod +x #{flex_compiler_de_path}")
+        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)
+      else
+        @kz_pod_enable = false
+        @generate_kz_pod_targets = false
+      end
     end
 
     def analyze_special_parameters(use_code_tag, use_framework_tag, pod_names)
@@ -123,5 +129,9 @@ module KZ
       end
     end
 
+    def kz_merge_swift_h_path
+      KZ_POD_CONFIG_ROOT_STR + '/kz_merge_swift_h.rb'
+    end
+
   end
 end

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

@@ -0,0 +1,31 @@
+
+module Pod
+  class Specification
+
+    def deployment_target(platform_name)
+      result = platform_hash[platform_name.to_s]
+      result ||= parent.deployment_target(platform_name) if parent
+      result = "9.0" if platform_name == "ios" && (result == nil || result.to_f < 9.0)
+      result
+    end
+
+    def platform_hash
+      case value = attributes_hash['platforms']
+      when String
+        { value => nil }
+      when Array
+        result = {}
+        value.each do |a_value|
+          result[a_value] = nil
+        end
+        result
+      when Hash
+        ios = value["ios"]
+        value["ios"] = 9.0 if ios == nil || ios.to_f < 9.0
+        value
+      else
+        {}
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 require 'cocoapods-kz/helpers/kz_global_helper'
 require 'cocoapods-kz/helpers/kz_pod_target'
+require 'xcodeproj'
 
 module Pod
   class Installer
@@ -15,22 +16,30 @@ module Pod
             end
 
             if generator.is_a?(Pod::Target::BuildSettings::AggregateTargetSettings)
-              xcconfig = generator.xcconfig
-              kz_clean_xcconfig(xcconfig)
-              main_hamp_search_path = '"' + KZ::KZ_POD_CONFIG_ROOT_STR + "/#{self.target.user_project.root_object.display_name}.hmap" + '"'
-              self.target.pod_targets.each do |native_pod_target|
-                kz_pod_target = native_pod_target.weakRef_kz_pod_target
-                if kz_pod_target
-                  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))
+              unless self.target.application_extension_api_only
+                xcconfig = generator.xcconfig
+                kz_clean_xcconfig(xcconfig)
+                main_hamp_search_path = '"' + KZ::KZ_POD_CONFIG_ROOT_STR + "/#{self.target.user_project.root_object.display_name}.hmap" + '"'
+                pod_targets = self.target.pod_targets_for_build_configuration(generator.configuration_name)
+                pod_targets.each do |native_pod_target|
+                  kz_pod_target = native_pod_target.weakRef_kz_pod_target
+                  if kz_pod_target
+                    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)
                   end
-                  add_repair_modulemap(xcconfig, kz_pod_target.all_repair_modulemap_paths)
                 end
-              end
-              xcconfig.attributes['HEADER_SEARCH_PATHS'] = main_hamp_search_path
-              xcconfig.attributes['USE_HEADERMAP'] = 'NO'
+                xcconfig.attributes['HEADER_SEARCH_PATHS'] = main_hamp_search_path
+                xcconfig.attributes['USE_HEADERMAP'] = 'NO'
 
-              kz_update_xcconfig_file(xcconfig, path)
+                if generator.configuration_name == 'Debug' && check_default_xcode_version_for_ld64
+                  other_linker_flags = xcconfig.other_linker_flags[:simple]
+                  other_linker_flags << '-ld64'
+                end
+                kz_update_xcconfig_file(xcconfig, path)
+                return
+              end
             elsif generator.is_a?(Pod::Target::BuildSettings::PodTargetSettings)
               kz_pod_target = self.target.weakRef_kz_pod_target
               if kz_pod_target
@@ -39,15 +48,14 @@ 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::KZGlobalHelper.instance.kz_merge_swift_h_path
 
                 add_repair_modulemap(xcconfig, kz_pod_target.all_repair_modulemap_paths)
                 kz_update_xcconfig_file(xcconfig, path)
-              else
-                origin_update_changed_file(generator, path)
+                return
               end
-            else
-              origin_update_changed_file(generator, path)
             end
+            origin_update_changed_file(generator, path)
           end
 
           def add_repair_modulemap(xcconfig, repair_modulemap_paths)
@@ -65,7 +73,6 @@ module Pod
             end
           end
 
-
           def kz_update_xcconfig_file(xcconfig, path)
             if path.exist?
               contents = xcconfig.to_s
@@ -98,6 +105,19 @@ module Pod
             xcconfig.attributes['OTHER_CFLAGS'] = new_flags.join(' ')
           end
 
+          def check_default_xcode_version_for_ld64
+            default_xcode_path = Pathname.new('/Applications/Xcode.app')
+            return false unless File.exist?(default_xcode_path)
+
+            xcode_info_plist = default_xcode_path + 'Contents/Info.plist'
+            _xcode_info_plist = KZ::KZ_POD_CONFIG_ROOT + 'Xcode_Info.plist'
+            FileUtils.cp(xcode_info_plist, _xcode_info_plist)
+            system "plutil -convert xml1 #{_xcode_info_plist.to_s} #{_xcode_info_plist.to_s}"
+            plist_hash = Xcodeproj::Plist.read_from_path(_xcode_info_plist)
+            FileUtils.rm(_xcode_info_plist)
+            plist_hash['CFBundleShortVersionString'] == '15.0'
+          end
+
         end
       end
     end

data/lib/cocoapods-kz/native.rb

@@ -1,7 +1,7 @@
 require 'cocoapods'
 require_relative 'gem_version'
 
-if Pod.match_version?('~> 1.4')
+if Pod.match_version?('~> 1.11')
   require 'cocoapods-kz/native/dls'
   require 'cocoapods-kz/native/installer'
   require 'cocoapods-kz/native/acknowledgements'
@@ -11,4 +11,5 @@ if Pod.match_version?('~> 1.4')
   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'
 end

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

@@ -0,0 +1,14 @@
+require 'fileutils'
+require 'pathname'
+
+product_swift_h_path = Pathname.new(ARGV[0])
+product_simulator_swift_h_path = Pathname.new(ARGV[1])
+target_swfit_h_path = Pathname.new(ARGV[2])
+
+if File.exist?(product_swift_h_path) && File.exist?(product_simulator_swift_h_path)
+  FileUtils.cp_r(product_swift_h_path, target_swfit_h_path)
+  replacement = File.read(product_simulator_swift_h_path)
+  content_a = File.read(target_swfit_h_path)
+  content_a.gsub!("#error unsupported Swift architecture", replacement)
+  File.write(target_swfit_h_path, content_a)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-kz
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - yixiong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-02 00:00:00.000000000 Z
+date: 2023-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,10 +68,12 @@ 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/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/hmap
+- lib/cocoapods-kz/resources/kz_merge_swift_h.rb
 - lib/cocoapods_plugin.rb
 homepage: https://github.com/EXAMPLE/cocoapods-kz
 licenses: