cocoapods-kz 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60b78485f551ed394bb167d18aad9e08008ea9c432ef555ade88cfc241f918bb
-  data.tar.gz: '082f62c4d943cde90357a9a5a55c10636a39ad232e9aded7230170301c01453e'
+  metadata.gz: e5dcadeaa76d480bc0a06c97d9f07fc514d4f6c6fa6e1321ea60546f9b425a5f
+  data.tar.gz: 01ab3e043531cbc9e29d6a73ddc15e63873245c7aa99c8a301ae79dc531f4914
 SHA512:
-  metadata.gz: ea906c0ac96d2c98a2eab4631a356cb1753de215ca0c0694cd13af454b3418f96f1fe4400d081c63f69115c6870efabdd146ef839168cdaa8d9de2ba3e2bdc6d
-  data.tar.gz: 295dec357984a4e81fea271b0b261af9e0dc6a0e383d048df8e46224521d3e77ee58124116b0e0d42731121af35d8d4234b92b63c51ca0fc26028e714cba830a
+  metadata.gz: e163e6c506505a9a1cf39ae263a5a40ccaf1ff8aae61d0ac808f1256106409ff7d5fd29de8c52abe9fb93666e42a6ad0db504a759eadb94b2781478a61aa83c9
+  data.tar.gz: f678b463d568835f87a1d5d490c8f5096651d94fe7123ce94ac26ea8eee3ea1bd9130e908b7e2c616811e26c804523ef5897b2c69306f8e0ca89160cd3159830

data/lib/cocoapods-kz/gem_version.rb

@@ -1,5 +1,5 @@
 module CocoapodsKz
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end
 
 module Pod

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

@@ -3,18 +3,41 @@ require_relative 'kz_global_helper'
 
 module KZ
 
+  class KZFlexLibInfo
+    attr_accessor :have_flexLib_pod
+    attr_accessor :have_kzswiftui_pod
+    attr_accessor :flexLib_version
+
+    def initialize
+      @have_flexLib_pod = false
+      @have_kzswiftui_pod = false
+      @flexLib_version = Pod::Version::ZERO
+    end
+  end
+
   class KZAnalyzer
     attr_accessor :all_kz_pod_targets
+    attr_accessor :pod_of_flexlib_info
 
     def initialize(native_pod_targets, development_pods)
       @native_pod_targets = native_pod_targets
       @development_pods = development_pods.keys
       @all_kz_pod_targets = {}
+      @pod_of_flexlib_info = KZFlexLibInfo.new
     end
 
     def analyer
       @native_pod_targets.each { |native_pod_target|
         create_kz_pod_target_from(native_pod_target, :kz_pod_origin_mode)
+
+        if native_pod_target.root_spec.name == "FlexLib"
+          @pod_of_flexlib_info ||= KZFlexLibInfo()
+          @pod_of_flexlib_info.have_flexLib_pod = true
+          @pod_of_flexlib_info.flexLib_version = native_pod_target.root_spec.version
+        elsif native_pod_target.root_spec.name == "KZSwiftUI"
+          @pod_of_flexlib_info ||= KZFlexLibInfo()
+          @pod_of_flexlib_info.have_kzswiftui_pod = true
+        end
       }
 
       # 检测是否有product名称相同的target

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

@@ -2,6 +2,7 @@ require_relative 'kz_pod_target'
 require_relative 'kz_global_helper'
 require_relative 'kz_config_result'
 require 'tmpdir'
+require 'shellwords'
 require_relative 'kz_log'
 
 module KZ
@@ -50,6 +51,26 @@ module KZ
       @@all_resources_cache_info
     end
 
+    def self.handle_origin_library(origin_libraries, kz_pod_target)
+      tempdir = Pathname(Dir.mktmpdir)
+      lib_frameworks_path = tempdir + "lib_frameworks"
+      FileUtils.mkdir_p(lib_frameworks_path)
+
+      origin_lib_frameworks = []
+      origin_libraries.each do |origin_library_path|
+        lib_framework_name = origin_library_path.basename(origin_library_path.extname)
+        lib_framework_path = lib_frameworks_path + "#{lib_framework_name}.framework"
+        FileUtils.mkdir_p(lib_framework_path)
+
+        FileUtils.cp(origin_library_path, lib_framework_path + lib_framework_name)
+        origin_lib_frameworks.append(lib_framework_path)
+      end
+
+      new_frameworks = handle_origin_framework(origin_lib_frameworks, kz_pod_target)
+      FileUtils.rm_r(tempdir)
+      new_frameworks
+    end
+
     def self.handle_origin_framework(origin_frameworks, kz_pod_target)
       new_frameworks = []
       old_destination_path = kz_pod_target.pod_config_cache_path(false , true)
@@ -181,7 +202,9 @@ module KZ
         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")
+          Dir["#{ar_x_path}/*.o"].each do |file|
+            system(ARM64_TO_SIMULATOR_EXECUTE_PATH, file)
+          end
           system("ar crv #{temp_framwork_exe_path} #{ar_x_path}/*.o &> /dev/null")
         else
           FileUtils.rm_r(tempdir)

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

@@ -96,10 +96,6 @@ module KZ
         FileUtils.rm_rf(KZ_POD_CONFIG_POD_TEMPDIR) if File.exist?(KZ_POD_CONFIG_POD_TEMPDIR)
         FileUtils.mkdir_p(KZ_POD_CONFIG_POD_TEMPDIR)
 
-        FileUtils.rm(FLEX_COMPLIER_PATH) if File.exist?(FLEX_COMPLIER_PATH)
-        FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler', FLEX_COMPLIER_PATH)
-        system("chmod +x #{FLEX_COMPLIER_PATH}")
-
         FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/kz_generator_framework.sh', KZ_GENERATOR_FRAMEWORK_PATH)
         system("chmod +x #{KZ_GENERATOR_FRAMEWORK_PATH}")
 
@@ -127,6 +123,18 @@ module KZ
       end
     end
 
+    def handle_flexCompiler
+      if have_flexLib_pod_target
+        FileUtils.rm(FLEX_COMPLIER_PATH) if File.exist?(FLEX_COMPLIER_PATH)
+        if @kz_analyzer.pod_of_flexlib_info.flexLib_version.major >= 4
+          FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler_V1', FLEX_COMPLIER_PATH)
+        else
+          FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler', FLEX_COMPLIER_PATH)
+        end
+        system("chmod +x #{FLEX_COMPLIER_PATH}")
+      end
+    end
+
     def analyze_special_parameters(use_code_tag, use_framework_tag, pod_names)
       specify_pod_names = []
       if pod_names.count > 0
@@ -159,10 +167,13 @@ module KZ
     end
 
     def have_flexLib_pod_target
+      return @kz_analyzer.pod_of_flexlib_info.have_kzswiftui_pod || @kz_analyzer.pod_of_flexlib_info.have_flexLib_pod
+    end
+
+    def check_and_copy_flex_compiler
       @kz_analyzer.all_kz_pod_targets.values.each do |target|
         return true if target.root_name == 'FlexLib' || target.root_name == 'KZSwiftUI'
       end
-      false
     end
 
     def write_lock_file

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

@@ -348,5 +348,12 @@ module KZ
       @on_demand_resources
     end
 
+    def get_swift_lldb_ast_path
+      if current_should_build? and current_uses_swift?
+        return "$(TARGET_BUILD_DIR)/#{root_name}/#{product_name}/Modules/#{product_basename}.swiftmodule/$(NATIVE_ARCH_ACTUAL)-$(LLVM_TARGET_TRIPLE_VENDOR)-$(SHALLOW_BUNDLE_TRIPLE).swiftmodule"
+      end
+      nil
+    end
+
   end
 end

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

@@ -70,18 +70,38 @@ module Pod
         end
       end
 
+      alias_method :origin_vendored_libraries, :vendored_libraries
+      def vendored_libraries
+        if self.kz_pod_target and KZ::KZGlobalHelper.instance.arm64_simulator
+          return []
+        else
+          origin_vendored_libraries
+        end
+      end
+
       alias_method :origin_vendored_frameworks, :vendored_frameworks
       def vendored_frameworks
         if self.kz_pod_target
-          frameworks = origin_vendored_frameworks
-          if KZ::KZGlobalHelper.instance.arm64_simulator && frameworks.count > 0
-            frameworks = KZ::KZFrameworkManager.handle_origin_framework(frameworks, self.kz_pod_target)
+          new_frameworks = []
+          if KZ::KZGlobalHelper.instance.arm64_simulator
+            libraries = origin_vendored_libraries
+            if libraries.count > 0
+              new_frameworks.concat(KZ::KZFrameworkManager.handle_origin_library(libraries, self.kz_pod_target))
+            end
+            frameworks = origin_vendored_frameworks
+            if frameworks.count > 0
+              new_frameworks.concat(KZ::KZFrameworkManager.handle_origin_framework(frameworks, self.kz_pod_target))
+            end
+          else
+            new_frameworks.concat(origin_vendored_frameworks)
           end
+
+          # 是否开启framework模式
           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)
+            new_frameworks.concat(result.get_framework_paths)
           end
-          frameworks
+          new_frameworks
         else
           origin_vendored_frameworks
         end

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

@@ -16,6 +16,7 @@ module Pod
         kz_analyer.analyer
         KZ::KZGlobalHelper.instance.kz_analyzer = kz_analyer
         KZ::KZGlobalHelper.instance.kz_generator = KZ::KZGenerator.new(main_project)
+        KZ::KZGlobalHelper.instance.handle_flexCompiler
       end
     end
 

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

@@ -21,6 +21,8 @@ module Pod
                 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)
+
+                swift_lldb_ast_paths = []
                 pod_targets.each do |native_pod_target|
                   kz_pod_target = native_pod_target.weakRef_kz_pod_target
                   if kz_pod_target
@@ -33,8 +35,16 @@ module Pod
                     if kz_pod_target.force_load
                       kz_add_force_load_tag(xcconfig, kz_pod_target)
                     end
+
+                    # 添加swift ast path
+                    ast_path = kz_pod_target.get_swift_lldb_ast_path
+                    if !ast_path.nil? and generator.configuration_name == "Debug"
+                      swift_lldb_ast_paths << ast_path
+                    end
                   end
                 end
+
+                kz_add_swift_lldb_ast_paths(xcconfig, swift_lldb_ast_paths)
                 xcconfig.attributes['HEADER_SEARCH_PATHS'] = main_hamp_search_path
                 xcconfig.attributes['USE_HEADERMAP'] = 'NO'
                 if KZ::KZGlobalHelper.instance.arm64_simulator
@@ -175,6 +185,16 @@ module Pod
             force_flags.add(KZ.deal_path_for_xcconfig(kz_pod_target.force_load_info, true))
           end
 
+          def kz_add_swift_lldb_ast_paths(xcconfig, swift_lldb_ast_paths)
+            if swift_lldb_ast_paths.count > 0
+              other_linker_flags = xcconfig.other_linker_flags
+              simple = other_linker_flags[:simple]
+              swift_lldb_ast_paths.each do |swift_lldb_ast_path|
+                simple.add("-Wl,-add_ast_path,#{KZ.deal_path_for_xcconfig(swift_lldb_ast_path, true)}")
+              end
+            end
+          end
+
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-kz
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - yixiong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-06 00:00:00.000000000 Z
+date: 2025-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,6 +78,7 @@ files:
 - lib/cocoapods-kz/native/target_installer_helper.rb
 - lib/cocoapods-kz/native/target_integrator.rb
 - lib/cocoapods-kz/resources/FlexCompiler
+- lib/cocoapods-kz/resources/FlexCompiler_V1
 - lib/cocoapods-kz/resources/arm64ToSimulator
 - lib/cocoapods-kz/resources/hmap
 - lib/cocoapods-kz/resources/kz_fix_force_load_exe.sh