cocoapods-binary-matchup 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b2d7e5383e4069928a8652aef16cd19446482e0149cb36dc4b880f68ffdd11d
-  data.tar.gz: b76423c11f50d5cba8f78c31c3707707aaf55511ef848225dfff0549ddb7c1c0
+  metadata.gz: 5ac1c4bb4db1b5e437ef1c6841de704d12e459b3f0e494af29d7f07421b6e33e
+  data.tar.gz: 6595cd815f89314d970ffdf1bfb8824b60b224c824b04d178643779984104ea3
 SHA512:
-  metadata.gz: a2f3f6d35e6aa9a410038014c97a5c4fddbac788da44ce2b2fce2fb72d55c04cf910794d5ee7718274f5d6d80ba47095abf870096c22fcda52707be5058d044e
-  data.tar.gz: fa74552e79a659791add383487f55fad19c492588fc5943f108cfff70fee9a98b1624e209c7bdb2c915b3dc800b8ec16773498a8fabf693f4cf5bef2673ecf13
+  metadata.gz: 80703fab252ab28abffb9b0932537add7c95e34d41ec042cc691e13224e4271d181a19dce9d0f88b75ff98fa832fafc32ad466234f17574f6dbd2d2e66c8c183
+  data.tar.gz: e5af0a07901d1a067e1e977a03daea4aecea122e7555c0516c82d1b733e3e7cd690890e14dd6c4ccdcf7005a2e95b7e2a87eac9102f95fc72b617f39895f7cba

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

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

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

@@ -123,10 +123,107 @@ 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]

metadata

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