cocoapods-bb-xcframework 0.2.6.4 → 0.2.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b4c60e8964374bb98b58a5aa9ebf315d18cf752cbbf35eebab71ae9bfb68d45
-  data.tar.gz: '028f3e39db67dcf294124e76eb6800ba634af4c02dc129a73b36daf65cf380d7'
+  metadata.gz: b0b8247f09ae9e9a153bdbf204ea123bec0ad7ac63d40673f51fe6c282d02c23
+  data.tar.gz: 6473f2b2995b8474794979db49c6497bf21f3ec31af77cbd47619f294aca8d38
 SHA512:
-  metadata.gz: 8810dbb80183b22c09ef068f4dbad5a00e83910bc6b6767ecd321ad76b1eb721f582322f1f25343d7d391fc1eacf75faf116622db159245cc3180a0e33b8e3ec
-  data.tar.gz: 6ee47de50f032f31fe3e57a416042df6da2b48220e2bf42e082c952153ef91bfae5cc93fb24fb71d6de6ecc836a626cc19f2f924bfe333fed6f23efacc67d874
+  metadata.gz: b6ca50c209203d62016f6672f348e7d4937b9620fde16a1f1ae7cf3415a2adc161e8c18931ec4a29bed22d6460e2c79097225b690c259ae352f966b30c3a7067
+  data.tar.gz: 3e711237af20aea6305694e093664fff7cd66e2cb719326c507d3469008ea4bdd92624f47c5e6dbed2ba3255587be05f53cb292f74f99db622b47bf18a4ed1d2

data/lib/cocoapods-xcframework/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsXCFramework
-  VERSION = "0.2.6.4"
+  VERSION = "0.2.6.6"
 end

data/lib/cocoapods-xcframework/util/pod_util.rb

@@ -312,20 +312,48 @@ module Pod
       origin_spec_hash = origin_spec.to_hash
       res_bundle=origin_spec_hash["resource_bundles"]
       if res_bundle
+        puts "s.resources:#{res_bundle}"
         puts "二进制库不支持动态生成bundle文件，请手动存放bundle文件 参照：s.resources = 'xx.bundle' ".red
         raise "#{res_bundle}"
       end
-      res_bundle=origin_spec_hash["resources"]
+      res_bundle = origin_spec_hash["resources"]
       if res_bundle
         puts "s.resources:#{res_bundle}"
-        bundle_path="#{project_dir}/#{res_bundle}"
-        FileUtils.cp_r(bundle_path,xcframework_path)
+        # `resources` may be a String (single path) or an Array (multiple paths)
+        res_list = if res_bundle.is_a?(Array)
+          res_bundle
+        else
+          [res_bundle]
+        end
+
         xcframework_comp = File.basename(xcframework_path)
-        bundle_comp = File.basename(res_bundle)
-        spec_hash["resources"] = "#{xcframework_comp}/#{bundle_comp}" # bundle资源存放规则，xcframework根目录
+        fixed_resources = []
+
+        res_list.each do |res_item|
+          next if res_item.nil?
+
+          # Only handle bundle-style resources here; keep other resource patterns as-is
+          if res_item.is_a?(String) && res_item.end_with?(".bundle")
+            bundle_path = "#{project_dir}/#{res_item}"
+            FileUtils.cp_r(bundle_path, xcframework_path)
+            bundle_comp = File.basename(res_item)
+            fixed_resources << "#{xcframework_comp}/#{bundle_comp}" # bundle资源存放规则，xcframework根目录
+          else
+            # For non-bundle resources (e.g. wildcards, asset catalogs), keep the original value
+            fixed_resources << res_item
+          end
+        end
+
+        # Keep the output type consistent with input: String in, String out; Array in, Array out
+        if res_bundle.is_a?(Array)
+          spec_hash["resources"] = fixed_resources
+        else
+          spec_hash["resources"] = fixed_resources.first
+        end
       end
       puts spec_hash.to_json
       spec_hash
     end
+
   end
 end

data/lib/cocoapods-xcframework/xbuilder/xcode_xbuild.rb

@@ -71,12 +71,39 @@ module Pod
         else
           command = "xcodebuild #{defines} BUILD_DIR=#{build_dir} BUILD_LIBRARY_FOR_DISTRIBUTION=YES clean build -configuration #{configuration} -alltargets -destination '#{destination}' ARCHS='#{archs}' SKIP_INSTALL=#{skip_install} | xcpretty 2>&1"
         end
-        UI.puts("XBuilder command:#{command}")
-        output = `#{command}`.lines.to_a
-        Dir.chdir pwd
-        if $?.exitstatus != 0
-          Pod::ErrorUtil.error_report command,output
-          Process.exit -1
+        # UI.puts("XBuilder command:#{command}")
+        # output = `#{command}`.lines.to_a
+        # Dir.chdir pwd
+        # if $?.exitstatus != 0
+        #   Pod::ErrorUtil.error_report command,output
+        #   Process.exit -1
+        # end
+        
+        # --- enhanced logging & reliable failure surfacing ---
+        log_dir  = File.join(work_dir, 'logs')
+        FileUtils.mkdir_p(log_dir)
+        scheme_name = (scheme || @spec&.name || 'Pods').to_s
+        plat_name   = platform.to_s.gsub(/\s+/, '_')
+        log_raw = File.join(log_dir, "xcodebuild-#{scheme_name}-#{plat_name}-#{configuration}.raw.log")
+
+        # Allow disabling xcpretty via env
+        use_pretty = ENV['XBUILDER_NOPRETTY'] != '1'
+        wrapped = if use_pretty
+          "set -o pipefail; #{command} | tee '#{log_raw}' | xcpretty"
+        else
+          # no pretty: just tee to log and console
+          "set -o pipefail; #{command} | tee '#{log_raw}'"
+        end
+        UI.puts "XBuilder command: #{command}"
+        success = system('bash', '-lc', wrapped)
+        unless success
+          UI.puts "\n** xcodebuild failed — showing last 200 lines of raw log: #{log_raw}".red
+          if File.exist?(log_raw)
+            tail = `tail -n 200 '#{log_raw}'`
+            UI.puts tail
+          end
+          Pod::ErrorUtil.error_report(command, []) if defined?(Pod::ErrorUtil)
+          Process.exit $?.exitstatus.nonzero? || 1
         end
       end
     end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-xcframework
 version: !ruby/object:Gem::Version
-  version: 0.2.6.4
+  version: 0.2.6.6
 platform: ruby
 authors:
 - humin
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -91,7 +90,6 @@ homepage: https://github.com/humin1102/cocoapods-bb-xcframework
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,8 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: 把podspec打包成xcframework的小工具。packager pod to a xcframework
 test_files: