cocoapods-kz 0.0.10 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f2ecfbcbc07e3ac505466898ae1b82fe6daf936bcfc56d7a128c7256a000888
-  data.tar.gz: '07248a9d57a52e6f2948b2d893d7463d8581f90d4bf29104df5d3465f991355c'
+  metadata.gz: 60b78485f551ed394bb167d18aad9e08008ea9c432ef555ade88cfc241f918bb
+  data.tar.gz: '082f62c4d943cde90357a9a5a55c10636a39ad232e9aded7230170301c01453e'
 SHA512:
-  metadata.gz: b32004addf7c59b259281c83d92fab22dc85d5e7f021992f9a3a86af996d8c3de764885fc6bf8b44b2094716743d9cb45133398f4468733c95def92fba911886
-  data.tar.gz: 4552647daba1c5c5265bc67302e84788a17bed18d6d87c93e70f90c6d3e97d393c342f6109f1f2f43e3a82ad3ab7071168e39df64b4b9ab35f9b3a308d6a06a8
+  metadata.gz: ea906c0ac96d2c98a2eab4631a356cb1753de215ca0c0694cd13af454b3418f96f1fe4400d081c63f69115c6870efabdd146ef839168cdaa8d9de2ba3e2bdc6d
+  data.tar.gz: 295dec357984a4e81fea271b0b261af9e0dc6a0e383d048df8e46224521d3e77ee58124116b0e0d42731121af35d8d4234b92b63c51ca0fc26028e714cba830a

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.13"
 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
@@ -27,7 +29,7 @@ module KZ
         config_folder = KZ_POD_CONFIG_POD_TARGETS + folder_name
         if File.directory?(config_folder)
           Dir.foreach(config_folder) do |version|
-            next if version == '.' || version == '..' || version == '.DS_Store'
+            next if version == '.' || version == '..' || version == '.DS_Store' || version == 'Headers'
 
             version_folder = config_folder + version
             if File.directory?(version_folder)
@@ -48,5 +50,171 @@ module KZ
       @@all_resources_cache_info
     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)
+      FileUtils.rm_rf(old_destination_path) if File.exist?(old_destination_path)
+
+      destination_path = kz_pod_target.pod_config_cache_path(true, 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