cocoapods-binary-matchup 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d82ba70bf3b96df6dbbe50edf16d8fec9c9272b6ccbde6c44a5daea0856fe32f
-  data.tar.gz: 7319e7a787a703cb65bcd1254e551d2915a77d425145ab1c2fb09cbb44c6d90e
+  metadata.gz: 5ac1c4bb4db1b5e437ef1c6841de704d12e459b3f0e494af29d7f07421b6e33e
+  data.tar.gz: 6595cd815f89314d970ffdf1bfb8824b60b224c824b04d178643779984104ea3
 SHA512:
-  metadata.gz: 3fe9edeed06572566c3da2b1e88614386dadbfbe23c511c2510896ffd5a267555f1173f319e85051368c7346586af30f7092de72409a6d8f19a52be01110e0e9
-  data.tar.gz: f8f40c9dc1161621d12326662160fd56639ebeae1fcb8fb82d4a035c070a2c284b256a341935dacb396b0afdcc332628439cf05ea0d4a2184111b997a998eb85
+  metadata.gz: 80703fab252ab28abffb9b0932537add7c95e34d41ec042cc691e13224e4271d181a19dce9d0f88b75ff98fa832fafc32ad466234f17574f6dbd2d2e66c8c183
+  data.tar.gz: e5af0a07901d1a067e1e977a03daea4aecea122e7555c0516c82d1b733e3e7cd690890e14dd6c4ccdcf7005a2e95b7e2a87eac9102f95fc72b617f39895f7cba

data/README.md

@@ -61,8 +61,6 @@ If bitcode is needed, add a `enable_bitcode_for_prebuilt_frameworks!` before all
 
 if forbidden simulator, add a `simulator_build_disable!` before all targets in Podfile 
 
-if custom main deployment target, add a `min_deployment_target(version)` before all targets in Podfile; e.g: `min_deployment_target(14.0)` 
-
 if custom build configuration is needed, add a `set_custom_xcodebuild_options_for_prebuilt_frameworks` before all targets in Podfile; e.g: 
 set_custom_xcodebuild_options_for_prebuilt_frameworks({
   :device => "ARCHS=arm64",

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

@@ -2,12 +2,17 @@ require 'fileutils'
 require 'digest'
 
 module Pod
+
+    class_attr_accessor :min_deployment_target
+
     module PrebuildCache
+
         class Cache
             
             # 获取缓存根目录
             def self.cache_root_dir
-                cache_dir = File.expand_path("~/.PodCache/#{Pod::Podfile::DSL.min_deployment_target}")
+                cache_dir = File.expand_path("~/.PodCache/#{Pod.min_deployment_target}")
+                UI.puts "🔍 cache_root_dir #{cache_dir}"
                 FileUtils.mkdir_p(cache_dir) unless Dir.exist?(cache_dir)
                 cache_dir
             end
@@ -89,6 +94,7 @@ module Pod
             
             # 检查缓存是否存在
             def self.cache_exists?(pod_name, version)
+                Pod::UI.puts "🔍 cache_exists? #{pod_name} #{version}"
                 cache_dir = cache_dir_for_pod(pod_name, version)
                 Dir.exist?(cache_dir) && !Dir.empty?(cache_dir)
             end

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

@@ -30,9 +30,6 @@ module Pod
                 DSL.dont_remove_source_code = true
             end
 
-            def min_deployment_target(target)
-                DSL.min_deployment_target = target
-            end
 
             # Add custom xcodebuild option to the prebuilding action
             #
@@ -68,9 +65,6 @@ module Pod
             class_attr_accessor :simulator_build_enabled
             self.simulator_build_enabled = true
 
-            class_attr_accessor :min_deployment_target
-            self.min_deployment_target = '14.0'
-
             private
             class_attr_accessor :prebuild_all
             self.prebuild_all = false
@@ -106,6 +100,13 @@ 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
+        Pod::UI.puts "📱 Project iOS Version: #{project_ios_version.version}"
+        Pod.min_deployment_target = project_ios_version.version
+    end
     
     
     # -- step 1: prebuild framework ---

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

@@ -1,3 +1,3 @@
 module CocoapodsBinary
-    VERSION = "0.0.16"
+    VERSION = "0.0.18"
 end

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

@@ -20,23 +20,20 @@ def build_for_iosish_platform(sandbox,
                               custom_build_options = [], # Array<String>
                               custom_build_options_simulator = [] # Array<String>
                               )
-
-  deployment_target = Pod::Podfile::DSL.min_deployment_target
   
   target_label = target.label # name with platform if it's used in multiple platforms
   Pod::UI.puts "Prebuilding #{target_label}..."
-  Pod::UI.puts "📦 deployment_target: #{deployment_target}"
   
   other_options = []
   # bitcode enabled
   other_options += ['BITCODE_GENERATION_MODE=bitcode'] if bitcode_enabled
 
-  is_succeed, _ = xcodebuild(sandbox, target_label, device, deployment_target, other_options + custom_build_options)
+  is_succeed, _ = xcodebuild(sandbox, target_label, device, target, other_options + custom_build_options)
   exit 1 unless is_succeed
   if Pod::Podfile::DSL.simulator_build_enabled
     # make less arch to iphone simulator for faster build
     custom_build_options_simulator += ['ARCHS=x86_64', 'ONLY_ACTIVE_ARCH=NO'] if simulator == 'iphonesimulator'
-    is_succeed, _ = xcodebuild(sandbox, target_label, simulator, deployment_target, other_options + custom_build_options_simulator)
+    is_succeed, _ = xcodebuild(sandbox, target_label, simulator, target, other_options + custom_build_options_simulator)
     exit 1 unless is_succeed
   end
 
@@ -126,18 +123,111 @@ def build_for_iosish_platform(sandbox,
 
   # output
   output_path.mkpath unless output_path.exist?
+
+  # 🔑 添加资源处理 - 修复 iOS 14 资源丢失问题
+  copy_resources_to_framework(sandbox, target, device_framework_path)
+
   FileUtils.mv device_framework_path, output_path, :force => true
 
 end
 
+# 新增函数：拷贝资源文件到 framework
+def copy_resources_to_framework(sandbox, target, framework_path)
+  Pod::UI.puts "📋 Processing resources for #{target.name}..."
+  
+  # 获取 target 的资源文件
+  pod_target = target
+  consumer = pod_target.root_spec.consumer(pod_target.platform.name)
+  file_accessor = Pod::Sandbox::FileAccessor.new(sandbox.pod_dir(pod_target.pod_name), consumer)
+  
+  # 1. 处理 resource_bundles（使用正确的 API）
+  resource_bundles = consumer.resource_bundles
+  unless resource_bundles.empty?
+    Pod::UI.puts "  📦 Processing #{resource_bundles.count} resource bundles"
+    resource_bundles.each do |bundle_name, bundle_files|
+      bundle_path = Pathname(framework_path).dirname + "#{bundle_name}.bundle"
+      if bundle_path.exist?
+        Pod::UI.puts "  📦 Found resource bundle: #{bundle_name}.bundle"
+      end
+    end
+  end
+  
+  # 2. 处理普通资源文件
+  unless file_accessor.resources.empty?
+    Pod::UI.puts "  📄 Processing #{file_accessor.resources.count} resource files"
+    file_accessor.resources.each do |resource_file|
+      if File.exist?(resource_file)
+        # 确定目标路径
+        relative_path = resource_file.relative_path_from(sandbox.pod_dir(pod_target.pod_name))
+        target_path = Pathname(framework_path) + relative_path.basename
+        
+        # 拷贝资源文件
+        FileUtils.cp_r(resource_file, target_path, :remove_destination => true)
+        Pod::UI.puts "    📄 Copied resource: #{relative_path.basename}"
+      end
+    end
+  end
+  
+  # 3. 特别处理 Assets.xcassets (iOS 14 兼容性)
+  assets_paths = file_accessor.resources.select { |path| path.extname == '.xcassets' }
+  unless assets_paths.empty?
+    Pod::UI.puts "  🎨 Processing #{assets_paths.count} Assets.xcassets for iOS 14 compatibility"
+    assets_paths.each do |assets_path|
+      relative_path = assets_path.relative_path_from(sandbox.pod_dir(pod_target.pod_name))
+      target_path = Pathname(framework_path) + relative_path.basename
+      
+      FileUtils.cp_r(assets_path, target_path, :remove_destination => true)
+      Pod::UI.puts "    📱 Copied Assets.xcassets: #{relative_path.basename}"
+    end
+  end
+  
+  # 4. 处理 vendored_frameworks
+  unless file_accessor.vendored_frameworks.empty?
+    Pod::UI.puts "  🔗 Processing #{file_accessor.vendored_frameworks.count} vendored frameworks"
+    file_accessor.vendored_frameworks.each do |vendored_framework|
+      if File.exist?(vendored_framework)
+        framework_name = vendored_framework.basename
+        target_path = Pathname(framework_path).dirname + framework_name
+        
+        FileUtils.cp_r(vendored_framework, target_path, :remove_destination => true)
+        Pod::UI.puts "    🔗 Copied vendored framework: #{framework_name}"
+      end
+    end
+  end
+  
+  # 5. 处理 vendored_libraries
+  unless file_accessor.vendored_libraries.empty?
+    Pod::UI.puts "  📚 Processing #{file_accessor.vendored_libraries.count} vendored libraries"
+    file_accessor.vendored_libraries.each do |vendored_library|
+      if File.exist?(vendored_library)
+        library_name = vendored_library.basename
+        target_path = Pathname(framework_path) + library_name
+        
+        FileUtils.cp_r(vendored_library, target_path, :remove_destination => true)
+        Pod::UI.puts "    📚 Copied vendored library: #{library_name}"
+      end
+    end
+  end
+  
+  # 6. iOS 14 特别处理：确保资源目录结构正确
+  deployment_target = Pod.min_deployment_target
+  if deployment_target && Gem::Version.new(deployment_target) < Gem::Version.new("15.0")
+    Pod::UI.puts "  🔧 Applying iOS 14 compatibility fixes..."
+    
+    # 确保 framework 内部有正确的目录结构
+    framework_resources_path = Pathname(framework_path) + "Resources"
+    framework_resources_path.mkpath unless framework_resources_path.exist?
+    
+    Pod::UI.puts "    ✅ iOS 14 compatibility applied"
+  end
+  
+  Pod::UI.puts "✅ Resource processing completed for #{target.name}"
+end
+
 def xcodebuild(sandbox, target, sdk='macosx', deployment_target=nil, other_options=[])
   args = %W(-project #{sandbox.project_path.realdirpath} -scheme #{target} -configuration #{CONFIGURATION} -sdk #{sdk} )
   platform = PLATFORMS[sdk]
-  if !platform.nil?
-    args += Fourflusher::SimControl.new.destination(:oldest, platform, deployment_target) unless platform.nil?
-  elsif 
-    args += ["IPHONEOS_DEPLOYMENT_TARGET=#{deployment_target}"]
-  end
+  args += Fourflusher::SimControl.new.destination(:oldest, platform, deployment_target) unless platform.nil?
   args += other_options
   Pod::UI.puts "📦 start compile project #{target} (#{args}) "
   log = `xcodebuild #{args.join(" ")} 2>&1`

data/spec/plugin_spec.rb

@@ -22,7 +22,6 @@ describe "CocoaPods Binary Matchup Plugin" do
     dsl_methods.should.include?(:all_binary!)
     dsl_methods.should.include?(:enable_bitcode_for_prebuilt_frameworks!)
     dsl_methods.should.include?(:keep_source_code_for_prebuilt_frameworks!)
-    dsl_methods.should.include?(:min_deployment_target)
     dsl_methods.should.include?(:simulator_build_disable!)
     dsl_methods.should.include?(:set_custom_xcodebuild_options_for_prebuilt_frameworks)
   end
@@ -30,18 +29,8 @@ describe "CocoaPods Binary Matchup Plugin" do
   it "should have correct default values for public attributes" do
     # 验证公开的默认配置值
     Pod::Podfile::DSL.simulator_build_enabled.should == true
-    # should是bacon中的测试断言，这里的意思是min_deployment_target应该等于'14.0'
-    Pod::Podfile::DSL.min_deployment_target.should == '14.0'
   end
 
-  it "should allow setting min_deployment_target" do
-    # 验证可以设置最小部署目标
-    original_target = Pod::Podfile::DSL.min_deployment_target
-    Pod::Podfile::DSL.min_deployment_target = '15.0'
-    Pod::Podfile::DSL.min_deployment_target.should == '15.0'
-    # 恢复原值
-    Pod::Podfile::DSL.min_deployment_target = original_target
-  end
 
   it "should allow toggling simulator build" do
     # 验证可以切换模拟器构建设置

metadata

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