cocoapods-binary-matchup 0.0.22 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29a67f3c826a3e9a9484ea9134684416586890c98fd713e4400cab569680f01a
-  data.tar.gz: be4047206d31ad740cf2816c7064a07b887b5ea056e42bf5244ca9fe83689d6d
+  metadata.gz: 71faa7369074eac18ed5cac6f96e63d0fe7c49d19fc08d09161ff4cd5deeb253
+  data.tar.gz: cef3ada6e2658b94f8ff5e74f6b66d2291fe5bb2fe403d858093c49bc17a19db
 SHA512:
-  metadata.gz: 1504f6e56481955e29340bb99dfc7591e62bff64d326d0bd143372be3d0b72d000c18fdd12c33cb17f6c6b45f492f03a9160bcd86a8979fa2420fb7b7ccbef87
-  data.tar.gz: ebe50d9c83c98873308675bd654fd5b314c26c7196dab582c59b2a8c40c218d9bdb11edfeb780f98c3331b2a906296e3c19501d830321d27fb97685d536c22b3
+  metadata.gz: 75c947239f8c4f31bb7b00df1a95da363944f425fcd117c3a6fca0d1d355165365c9a78b159977a7f4342f6e657a1a627682ccf16745fe5dee2c0da4dae14533
+  data.tar.gz: be2acd36899d609a58c402889a1570dc49efa3ee3af5c5b4451e6dc32a570f1266b886c727df9e5eb94e77554aa22349ac4f126d27ece4c465d081efeeab1cda

data/lib/cocoapods-binary-matchup/Integration.rb

@@ -29,7 +29,6 @@ module Pod
                 # 获取pod版本信息
                 prebuild_sandbox = Pod::PrebuildSandbox.from_standard_sandbox(standard_sanbox)
 
-                pod_version = Pod::PrebuildCache::Cache.get_pod_version(prebuild_sandbox, self.name)
                 target_folder = standard_sanbox.pod_dir(self.name)
                 target_folder.rmtree if target_folder.exist?
                 
@@ -41,7 +40,7 @@ module Pod
                     UI.puts "📦 Copied prebuilt files for #{self.name}: #{real_file_folder} -> #{target_folder}"
                     
                     # 3. 同时保存到缓存（如果缓存不存在）
-                    Pod::PrebuildCache::Cache.save_to_cache(self.name, pod_version, target_folder.to_s)
+                    Pod::PrebuildCache::Cache.save_to_cache(self.name, target_folder.to_s)
                 else
                     UI.puts "⚠️  Warning: Prebuilt files not found for #{self.name} at #{real_file_folder}"
                     # 如果预构建文件不存在，创建空目录避免错误

data/lib/cocoapods-binary-matchup/Integration_cache.rb

@@ -1,32 +1,39 @@
 require 'fileutils'
 require 'digest'
+require 'set'
 
 module Pod
 
-    class_attr_accessor :min_deployment_target
-
     class_attr_accessor :main_deployment_target_name
 
     module PrebuildCache
 
         class Cache
             
+            # 类变量用于跟踪依赖关系和失效的pod
+            @@dependency_graph = {}
+            
             # 获取缓存根目录
             def self.cache_root_dir
-                cache_dir = File.expand_path("~/.PodCache/#{Pod.min_deployment_target}-#{Pod.main_deployment_target_name}")
-                UI.puts "🔍 cache_root_dir #{cache_dir}"
+                cache_dir = File.expand_path("~/.PodCache/#{Pod.main_deployment_target_name}")
                 FileUtils.mkdir_p(cache_dir) unless Dir.exist?(cache_dir)
                 cache_dir
             end
             
+            # 获取manifest.lock缓存路径
+            def self.cached_manifest_path
+                File.join(cache_root_dir, 'Manifest.lock')
+            end
+            
             # 获取特定pod的缓存目录
-            def self.cache_dir_for_pod(pod_name, version)
-                File.join(cache_root_dir, pod_name, version)
+            def self.cache_dir_for_pod(pod_name)
+                File.join(cache_root_dir, pod_name)
             end
             
             # 获取pod的版本信息，优先使用commit hash
             def self.get_pod_version(sandbox, pod_name)
                 UI.puts "🔍 starting get pod version: #{pod_name}"
+                UI.puts "🔍 get_pod_version sandbox: #{sandbox.manifest_path}"
                 checkout_options = sandbox.manifest.checkout_options_for_pod_named(pod_name)
                 # 优先使用checkout_options中的检出来源
                 if checkout_options
@@ -76,90 +83,24 @@ module Pod
                 return "unknown"
             end
             
-            # 计算目录内容的哈希值（用于验证缓存完整性）
-            def self.calculate_dir_hash(dir_path)
-                return nil unless Dir.exist?(dir_path)
-                
-                files = Dir.glob("#{dir_path}/**/*", File::FNM_DOTMATCH).select { |f| File.file?(f) }
-                files.sort!
-                
-                hasher = Digest::SHA256.new
-                files.each do |file|
-                    # 添加文件路径和修改时间到哈希计算中
-                    relative_path = file.sub("#{dir_path}/", "")
-                    hasher.update(relative_path)
-                    hasher.update(File.mtime(file).to_s)
-                end
-                
-                hasher.hexdigest
-            end
-            
             # 检查缓存是否存在
-            def self.cache_exists?(pod_name, version)
-                Pod::UI.puts "🔍 cache_exists? #{pod_name} #{version}"
-                cache_dir = cache_dir_for_pod(pod_name, version)
+            def self.cache_exists?(pod_name)
+                cache_dir = cache_dir_for_pod(pod_name)
+                Pod::UI.puts "🔍 cache_exists? #{cache_dir}"
                 Dir.exist?(cache_dir) && !Dir.empty?(cache_dir)
             end
             
-            # 检查缓存是否存在且有效（用于验证完整性）
-            def self.cache_valid?(pod_name, version, source_dir = nil)
-                cache_dir = cache_dir_for_pod(pod_name, version)
-                return false unless Dir.exist?(cache_dir)
-                
-                # 如果没有提供源目录，只检查缓存是否存在
-                return true if source_dir.nil?
-                
-                # 检查缓存的哈希文件
-                hash_file = File.join(cache_dir, '.cache_hash')
-                return false unless File.exist?(hash_file)
-                
-                begin
-                    cached_hash = File.read(hash_file).strip
-                    current_hash = calculate_dir_hash(source_dir)
-                    
-                    return cached_hash == current_hash
-                rescue => e
-                    Pod::UI.puts "⚠️  Warning: Cannot validate cache for #{pod_name}: #{e.message}"
-                    return false
-                end
-            end
-            
-            # 从缓存恢复pod
-            def self.restore_from_cache(pod_name, version, target_dir)
-                cache_dir = cache_dir_for_pod(pod_name, version)
-                
-                return false unless Dir.exist?(cache_dir)
-                
-                begin
-                    # 删除目标目录
-                    FileUtils.rm_rf(target_dir) if Dir.exist?(target_dir)
-                    
-                    # 从缓存拷贝到目标目录
-                    FileUtils.cp_r(cache_dir, target_dir, :remove_destination => true)
-                    
-                    # 删除缓存标记文件
-                    hash_file = File.join(target_dir, '.cache_hash')
-                    File.delete(hash_file) if File.exist?(hash_file)
-                    
-                    Pod::UI.puts "📦 Restored #{pod_name} (#{version}) from cache"
-                    return true
-                rescue => e
-                    Pod::UI.puts "❌ Failed to restore #{pod_name} from cache: #{e.message}"
-                    return false
-                end
-            end
-            
             # 保存到缓存（如果缓存不存在的话）
-            def self.save_to_cache(pod_name, version, source_dir)
+            def self.save_to_cache(pod_name, source_dir)
                 return unless Dir.exist?(source_dir)
                 
                 # 检查缓存是否已经存在，如果存在则不覆盖
-                if cache_exists?(pod_name, version)
-                    Pod::UI.puts "📦 Cache already exists for #{pod_name} (#{version}), skipping save"
+                if cache_exists?(pod_name)
+                    Pod::UI.puts "📦 Cache already exists for #{pod_name}, skipping save"
                     return true
                 end
                 
-                cache_dir = cache_dir_for_pod(pod_name, version)
+                cache_dir = cache_dir_for_pod(pod_name)
                 
                 begin
                     # 创建缓存目录
@@ -170,13 +111,6 @@ module Pod
                     
                     # 拷贝到缓存
                     FileUtils.cp_r(source_dir, cache_dir, :remove_destination => true)
-                    
-                    # 保存哈希值
-                    source_hash = calculate_dir_hash(source_dir)
-                    hash_file = File.join(cache_dir, '.cache_hash')
-                    File.write(hash_file, source_hash)
-                    
-                    Pod::UI.puts "💾 Saved #{pod_name} (#{version}) to cache"
                     return true
                 rescue => e
                     Pod::UI.puts "❌ Failed to save #{pod_name} to cache: #{e.message}"
@@ -184,138 +118,200 @@ module Pod
                 end
             end
             
-            # 尝试从缓存拷贝到目标目录（如果缓存存在）
-            def self.copy_from_cache_if_exists(pod_name, version, target_dir)
-                return false unless cache_exists?(pod_name, version)
-                
-                cache_dir = cache_dir_for_pod(pod_name, version)
-                
+            # 保存当前manifest.lock到缓存目录
+            def self.save_manifest_to_cache(sandbox)
                 begin
-                    # 删除目标目录
-                    FileUtils.rm_rf(target_dir) if Dir.exist?(target_dir)
-                    
-                    # 从缓存拷贝到目标目录
-                    FileUtils.cp_r(cache_dir, target_dir, :remove_destination => true)
-                    
-                    # 删除缓存标记文件
-                    hash_file = File.join(target_dir, '.cache_hash')
-                    File.delete(hash_file) if File.exist?(hash_file)
-                    
-                    Pod::UI.puts "📦 Copied #{pod_name} (#{version}) from cache"
-                    return true
+                    # 查找_Prebuild目录中的manifest.lock
+                    prebuild_manifest = sandbox.root + 'Manifest.lock'
+                    # 如果存在，复制到缓存目录
+                    if prebuild_manifest.exist?
+                        cached_path = cached_manifest_path
+                        FileUtils.cp(prebuild_manifest, cached_path)
+                        Pod::UI.puts "💾 save_manifest_to_cache Manifest.lock to cache: #{cached_path}"
+                        return true
+                    else
+                        Pod::UI.puts "⚠️ save_manifest_to_cache Manifest.lock not found in _Prebuild directory"
+                        return false
+                    end
                 rescue => e
-                    Pod::UI.puts "❌ Failed to copy #{pod_name} from cache: #{e.message}"
+                    Pod::UI.puts "❌ save_manifest_to_cache save Manifest.lock to cache failed: #{e.message}"
                     return false
                 end
             end
             
-            # 清理过期缓存（可选功能）
-            def self.clean_expired_cache(days = 30)
-                return unless Dir.exist?(cache_root_dir)
-                
-                cutoff_time = Time.now - (days * 24 * 60 * 60)
-                cleaned_count = 0
-                
-                Dir.glob("#{cache_root_dir}/*/*").each do |cache_dir|
-                    next unless Dir.exist?(cache_dir)
+            # 清空所有缓存
+            def self.clear_all_caches
+                begin
+                    cache_dir = cache_root_dir
                     
-                    if File.mtime(cache_dir) < cutoff_time
-                        begin
-                            FileUtils.rm_rf(cache_dir)
-                            cleaned_count += 1
-                            Pod::UI.puts "🗑️  Cleaned expired cache: #{File.basename(File.dirname(cache_dir))}/#{File.basename(cache_dir)}"
-                        rescue => e
-                            Pod::UI.puts "❌ Failed to clean cache #{cache_dir}: #{e.message}"
+                    # 删除除了cached_manifest.lock之外的所有缓存
+                    Dir.glob("#{cache_dir}/*").each do |path|
+                        next if File.basename(path) == 'Manifest.lock'
+                        
+                        if Dir.exist?(path)
+                            FileUtils.rm_rf(path)
+                            Pod::UI.puts "🗑️  Cleared cache directory: #{File.basename(path)}"
                         end
                     end
+                    
+                    Pod::UI.puts "✅ All pod caches cleared due to dependency changes"
+                    
+                rescue => e
+                    Pod::UI.puts "❌ Error clearing caches: #{e.message}"
                 end
-                
-                Pod::UI.puts "✅ Cleaned #{cleaned_count} expired cache entries" if cleaned_count > 0
             end
             
-            # 获取缓存统计信息
-            def self.cache_stats
-                return {} unless Dir.exist?(cache_root_dir)
-                
-                stats = {
-                    total_pods: 0,
-                    total_versions: 0,
-                    total_size: 0
-                }
-                
-                Dir.glob("#{cache_root_dir}/*").each do |pod_dir|
-                    next unless Dir.exist?(pod_dir)
+            # 验证pod版本一致性（与缓存时的manifest对比）
+            def self.validate_pod_version_consistency(pod_name, current_version)
+                begin
+                    manifest_path = cached_manifest_path
+                    Pod::UI.puts "🔍 validate_pod_version_consistency pod_name: #{pod_name} manifest_path: #{manifest_path}"
+                    # 如果没有缓存的manifest，认为一致（首次构建）
+                    unless File.exist?(manifest_path)
+                        return true
+                    end
                     
-                    stats[:total_pods] += 1
+                    # 创建基于缓存manifest的临时sandbox来获取缓存版本
+                    cached_version = get_cached_pod_version(pod_name, cached_manifest_path)
                     
-                    Dir.glob("#{pod_dir}/*").each do |version_dir|
-                        next unless Dir.exist?(version_dir)
-                        
-                        stats[:total_versions] += 1
-                        
-                        # 计算目录大小
-                        size = `du -sk "#{version_dir}" 2>/dev/null`.split.first.to_i * 1024
-                        stats[:total_size] += size
+                    # 对比版本
+                    if current_version == cached_version
+                        return true
+                    else
+                        Pod::UI.puts "🔄 #{pod_name} version changed: #{cached_version} → #{current_version}"
+                        return false
                     end
+                    
+                rescue => e
+                    Pod::UI.puts "⚠️  Error validating version consistency for #{pod_name}: #{e.message}"
+                    return false
                 end
+            end
+            
+            # 从缓存的manifest中获取pod版本（复用get_pod_version的逻辑）
+            def self.get_cached_pod_version(pod_name, cached_manifest_path)
+                begin
+                    # 使用缓存目录作为根目录创建PrebuildSandbox
+                    # 因为Manifest.lock就在cache_root_dir下，可以直接使用
+                    cache_dir = File.dirname(cached_manifest_path)
+                    temp_sandbox = Pod::PrebuildSandbox.new(cache_dir)
+                    
+                    # 复用现有的get_pod_version逻辑
+                    return get_pod_version(temp_sandbox, pod_name)
+                    
+                rescue => e
+                    Pod::UI.puts "⚠️  Error reading cached version for #{pod_name}: #{e.message}"
+                    return "unknown"
+                end
+            end
+            
+            # 获取指定target的反向依赖（哪些targets依赖于它）
+            def self.find_reverse_dependencies(target_to_find, all_pod_targets)
+                reverse_deps = all_pod_targets.select do |pod_target|
+                    # 跳过自己
+                    next false if pod_target.pod_name == target_to_find.pod_name
+                    # 检查当前pod_target的正向递归依赖中是否包含目标target
+                    pod_target.recursive_dependent_targets.include?(target_to_find)
+                end
+
+                reverse_deps.map { |item| item.pod_name }
+            end
+
+            # 构建简单的依赖关系图（从targets获取）
+            def self.build_simple_dependency_graph(target, total_targets)                
+                return if total_targets.nil? || total_targets.empty?
                 
-                stats
+                Pod::UI.puts "🔍 Building reverse dependency graph for cache validation..."
+                begin
+                    pod_name = target.pod_name
+                    @@dependency_graph[pod_name] = []
+                    dependencies = []
+                    temp_dependencies = find_reverse_dependencies(target, total_targets)
+                    if !temp_dependencies.nil?
+                        dependencies = temp_dependencies
+                    end
+
+                    @@dependency_graph[pod_name] = dependencies                    
+                rescue => e
+                    Pod::UI.puts "⚠️  Warning: Error processing target #{target}: #{e.message}"
+                end                
             end
             
-            # 打印缓存统计信息
-            def self.print_cache_stats
-                stats = cache_stats
-                if stats[:total_pods] > 0
-                    size_mb = (stats[:total_size] / 1024.0 / 1024.0).round(2)
-                    Pod::UI.puts "📊 Cache Stats: #{stats[:total_pods]} pods, #{stats[:total_versions]} versions, #{size_mb} MB"
-                else
-                    Pod::UI.puts "📊 Cache is empty"
+            # 删除pod的缓存
+            def self.invalidate_pod_cache(pod_name)
+                cache_dir = cache_dir_for_pod(pod_name)
+                Pod::UI.puts "🗑️ start Removed invalid cache for #{pod_name}"
+                if Dir.exist?(cache_dir)
+                    FileUtils.rm_rf(cache_dir)
+                    Pod::UI.puts "🗑️ end  Removed invalid cache for #{pod_name}"
                 end
             end
+
+            def self.remove_all_invalid_cache(sandbox, all_targets)
+                all_targets.each do |target|
+                    build_simple_dependency_graph(target, all_targets)
+                    current_version = get_pod_version(sandbox, target.pod_name)
+                    if validate_pod_version_consistency(target.pod_name, current_version)
+                        Pod::UI.puts "🔍 validate_pod_version_consistency #{target.pod_name} #{current_version}"
+                    else
+                        cascade_invalidate_dependents(target.pod_name)
+                        Pod::UI.puts "❌ validate_pod_version_consistency #{target.pod_name} #{current_version}"
+                    end
+                end
+                Pod::UI.puts "📊 Dependency graph: #{@@dependency_graph}"
+            end
+            
+            # 级联失效依赖当前pod的其他pod
+            def self.cascade_invalidate_dependents(invalidated_pod)                
+                # 查找所有依赖invalidated_pod的pod
+                dependenciess = @@dependency_graph[invalidated_pod]
+                return if dependenciess.nil? || !dependenciess.any?
+                invalidate_pod_cache(invalidated_pod)
+                dependenciess.each do |dependent_pod|
+                    invalidate_pod_cache(dependent_pod)
+                end
+            end
+            
+            # 重置依赖验证状态并检查manifest一致性
+            def self.reset_dependency_validation(sandbox = nil)
+                @@dependency_graph.clear
+                Pod::UI.puts "🔄 Reset dependency validation state"
+            end
             
-            # 从 ~/.PodCache 恢复缓存到 _prebuild 目录
+            # 从 ~/.PodCache 恢复缓存到 _prebuild 目录（版本感知版）
             def self.restore_from_pod_cache(pod_name, prebuild_sandbox)
                 begin
-                    Pod::UI.puts "🔍 Checking cache for #{pod_name} #{prebuild_sandbox}"
-                    
-                    restored_count = 0
-                    missing_pods = []
+                    Pod::UI.puts "🔍 Checking cache for #{pod_name}"
                     
                     # 获取pod版本信息
                     pod_version = get_pod_version(prebuild_sandbox, pod_name)
                     
                     # 检查缓存是否存在
-                    if cache_exists?(pod_name, pod_version)
-                        # 从缓存复制到_prebuild目录
-                        cache_dir = cache_dir_for_pod(pod_name, pod_version)
-                        target_dir = prebuild_sandbox.framework_folder_path_for_pod_name(pod_name)
-                        
-                        # 确保目标目录存在
-                        target_dir.parent.mkpath unless target_dir.parent.exist?
-                        
-                        # 复制缓存到_prebuild
-                        FileUtils.cp_r(cache_dir, target_dir, :remove_destination => true)
-                        
-                        # 删除缓存标记文件
-                        hash_file = target_dir + '.cache_hash'
-                        hash_file.delete if hash_file.exist?
-                        
-                        Pod::UI.puts "📦 Restored #{pod_name} (#{pod_version}) from cache"
-                        restored_count += 1
-                    else
-                        missing_pods << pod_name
-                    end
-                    
-                    if missing_pods.empty?
-                        Pod::UI.puts "✅ Successfully restored all #{restored_count} pods from cache"
-                        return true
-                    else
-                        Pod::UI.puts "⚠️  Missing cache for #{missing_pods.count} pods: #{missing_pods.join(', ')}"
+                    unless cache_exists?(pod_name)
+                        Pod::UI.puts "⚠️  No cache found for #{pod_name}"
                         return false
                     end
                     
+                    # 所有验证通过，从缓存恢复
+                    cache_dir = cache_dir_for_pod(pod_name)
+                    target_dir = prebuild_sandbox.framework_folder_path_for_pod_name(pod_name)
+                    
+                    # 确保目标目录存在
+                    target_dir.parent.mkpath unless target_dir.parent.exist?
+                    
+                    # 复制缓存到_prebuild
+                    FileUtils.cp_r(cache_dir, target_dir, :remove_destination => true)
+                    
+                    # 删除缓存标记文件
+                    hash_file = target_dir + '.cache_hash'
+                    hash_file.delete if hash_file.exist?
+                    
+                    Pod::UI.puts "📦 Successfully restored #{pod_name} (#{pod_version}) from cache"
+                    return true
+                    
                 rescue => e
                     Pod::UI.puts "❌ Error restoring from cache: #{e.message}"
+                    # 出错时也标记为失效
                     return false
                 end
             end

data/lib/cocoapods-binary-matchup/Main.rb

@@ -100,14 +100,6 @@ Pod::HooksManager.register('cocoapods-binary-matchup', :pre_install) do |install
             exit
         end
     end
-
-    root_target = installer_context.podfile.target_definition_list.first
-    if root_target.platform
-        project_ios_version = root_target.platform.deployment_target
-        target_name = root_target
-        Pod::UI.puts "📱 Project iOS Version: #{project_ios_version.version}, name: #{target_name}"
-        Pod.min_deployment_target = project_ios_version.version
-    end
     
     main_target = installer_context.podfile.target_definition_list[1]
     if main_target.platform
@@ -280,7 +272,6 @@ def scan_framework_resources(framework_dir, pod_name)
     framework_name = framework_dir.basename.to_s
     
     Pod::UI.puts "      🎯 Framework path: #{framework_dir}"
-    Pod::UI.puts "      🎯 Pod name: #{pod_name}, Framework name: #{framework_name}"
     
     # 资源文件类型
     resource_patterns = [
@@ -302,28 +293,23 @@ def scan_framework_resources(framework_dir, pod_name)
                 # 例如：${PODS_ROOT}/CocoaDebug/CocoaDebug.framework/App.storyboardc
             resource_entry = "${PODS_ROOT}/#{pod_name}/#{framework_name}/#{resource_file.basename}"            
             resources << resource_entry
-            Pod::UI.puts "        📄 Found: #{resource_file.basename} -> #{resource_entry}"
         end
     end
     
     # 扫描framework/Resources目录
     resources_dir = framework_dir + 'Resources'
     if resources_dir.exist?
-        Pod::UI.puts "        📁 Scanning Resources subdirectory"
         resource_patterns.each do |pattern|
             Dir.glob(resources_dir + pattern).each do |resource_path|
                 resource_file = Pathname(resource_path)
                 
                 # Resources目录中的资源也使用BUILT_PRODUCTS_DIR路径
                 resource_entry = "${PODS_ROOT}/#{pod_name}/#{framework_name}/#{resource_file.basename}"
-                resources << resource_entry
-                
-                Pod::UI.puts "        📄 Found in Resources/: #{resource_file.basename} -> #{resource_entry}"
+                resources << resource_entry                
             end
         end
     end
     
-    Pod::UI.puts "      📊 Total resources found: #{resources.count}"
     resources
 end
 
@@ -334,15 +320,15 @@ def modify_resources_script(script_path, framework_resources)
     original_content = script_path.read
     
     # 检查是否已经添加过framework资源（避免重复）
-    if original_content.include?('# Prebuilt Framework Resources')
-        Pod::UI.puts "    ℹ️  Framework resources already added, skipping"
-        return
-    end
-    
-    Pod::UI.puts "    📝 Adding #{framework_resources.count} framework resources to script"
-    framework_resources.each_with_index do |resource, index|
-        Pod::UI.puts "      #{index + 1}. #{resource}"
-    end
+    # if original_content.include?('# Prebuilt Framework Resources')
+    #     Pod::UI.puts "    ℹ️  Framework resources already added, skipping"
+    #     return
+    # end
+    
+    # Pod::UI.puts "    📝 Adding #{framework_resources.count} framework resources to script"
+    # framework_resources.each_with_index do |resource, index|
+    #     Pod::UI.puts "      #{index + 1}. #{resource}"
+    # end
     
     # 构建要添加的资源安装代码
     framework_resources_block = build_framework_resources_block(framework_resources)

data/lib/cocoapods-binary-matchup/Prebuild.rb

@@ -99,7 +99,6 @@ module Pod
                     not exsited_framework_names.include?(pod_name)
                 end
 
-
                 root_names_to_update = (added + changed + missing)
 
                 # transform names to targets
@@ -122,7 +121,8 @@ module Pod
 
             targets = targets.reject {|pod_target| sandbox.local?(pod_target.pod_name) }
 
-            
+            Pod::PrebuildCache::Cache.remove_all_invalid_cache(sandbox, targets)
+
             # build!
             Pod::UI.puts "Prebuild frameworks (total #{targets.count})"
             Pod::Prebuild.remove_build_dir(sandbox_path)
@@ -203,6 +203,9 @@ module Pod
                     end
                 end
             end
+
+            # save the manifest.lock to cache
+            Pod::PrebuildCache::Cache.save_manifest_to_cache(sandbox)
             
             # Remove useless files
             # remove useless pods

data/lib/cocoapods-binary-matchup/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBinary
-    VERSION = "0.0.22"
+    VERSION = "0.0.24"
 end

data/lib/cocoapods-binary-matchup/rome/build_framework.rb

@@ -227,6 +227,7 @@ def xcodebuild(sandbox, target, sdk='macosx', deployment_target=nil, other_optio
   is_succeed = (exit_code == 0)
 
   if !is_succeed
+    Pod::UI.puts "❌ Build failed for target #{target} (exit code: #{exit_code})".red
     begin
         if log.include?('** BUILD FAILED **')
             # use xcpretty to print build log
@@ -241,6 +242,8 @@ def xcodebuild(sandbox, target, sdk='macosx', deployment_target=nil, other_optio
     rescue
         puts log.red
     end
+    Pod::UI.puts "💥 Compilation terminated due to build failure. Please check the error messages above.".red
+    exit 1
   end
   [is_succeed, log]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-matchup
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.24
 platform: ruby
 authors:
 - leavez