cocoapods-bb-xcframework 0.2.6.3 → 0.2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be757b65dcad2eee788c536a5546173235e0763e8e55df3a935811554de77afd
-  data.tar.gz: 485a105ead0d091f645b49ad59a0da64afe3d4510ab2654e4215dfbb007fb7ca
+  metadata.gz: 1a83d3846da44025ba26e03b0953dbb3d040ea22ea08a845ab3709b1abc221bc
+  data.tar.gz: 7d74a47b3749e010bb1a9c0415f7fd1985e8c5c2bb9d3318e37b9f34b36383e8
 SHA512:
-  metadata.gz: 161d22ffdf76f7af4753ebdbd8866b54c754855700d4b833b38cf80495690e98a18482e55bf1abca9ffaa99631279fe91cc581a9cc1cfac06d8d66b4250563d5
-  data.tar.gz: b65ef5e847ace4cb2ac17d9e1c52c4e61fc8a839758aa839e1e4a019b109c64e8bc9687beacb07c606ba8fd26be007b93cb1c3714004875e4207fc60ca37102d
+  metadata.gz: e9c77d4c42bdcb027d279915f678411b320598983b57c955dc47cd6af915e359484ab174b5748c0226f85e19fc974779b2ead6a10ef5847a85249705ae785edf
+  data.tar.gz: 95605f64168e45a6fcb68337176bc7879aba2b70b8461dab47c392cd23c45a72aef1045090791a47077a4d59dc429bfb8148d90fa1f7f909520f2ddc110e464d

data/lib/cocoapods-xcframework/frameworker.rb

@@ -19,7 +19,7 @@ module Pod
 
     def run
       spec = spec_with_path @name
-      UI.warn "正在生成XCFramework #{spec.name}(#{spec.version})"
+      UI.puts "正在生成XCFramework #{spec.name}(#{spec.version})".yellow
       @is_spec_from_path = true if spec
       spec ||= spec_with_name @name
 

data/lib/cocoapods-xcframework/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsXCFramework
-  VERSION = "0.2.6.3"
+  VERSION = "0.2.6.5"
 end

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

@@ -301,6 +301,29 @@ module Pod
           end
         end
       end
+      puts "fix_header_file".yellow
+      puts spec_hash.to_json
+      spec_hash
+    end
+
+    # 脚本不会针对podspec中配置resources、resource_bundles动态生成bundle，故手动进行bundle路径修复
+    def fix_bundle_file(origin_spec, spec_hash, project_dir, xcframework_path)
+      puts "fix_bundle_file".yellow
+      origin_spec_hash = origin_spec.to_hash
+      res_bundle=origin_spec_hash["resource_bundles"]
+      if res_bundle
+        puts "二进制库不支持动态生成bundle文件，请手动存放bundle文件 参照：s.resources = 'xx.bundle' ".red
+        raise "#{res_bundle}"
+      end
+      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)
+        xcframework_comp = File.basename(xcframework_path)
+        bundle_comp = File.basename(res_bundle)
+        spec_hash["resources"] = "#{xcframework_comp}/#{bundle_comp}" # bundle资源存放规则，xcframework根目录
+      end
       puts spec_hash.to_json
       spec_hash
     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

data/lib/cocoapods-xcframework/xbuilder.rb

@@ -183,7 +183,9 @@ module Pod
       outputs_bundle target_dir
       new_spec_hash = generic_new_podspec_hash @spec
       new_spec_hash[:vendored_frameworks] = "#{@spec.name}.xcframework"
-      new_spec_hash = fix_header_file new_spec_hash, "#{target_dir}/#{@spec.name}.xcframework"
+      xcframework_path = "#{target_dir}/#{@spec.name}.xcframework"
+      new_spec_hash = fix_header_file new_spec_hash, xcframework_path
+      new_spec_hash = fix_bundle_file(@spec, new_spec_hash, @source_dir, xcframework_path)
       find_bundles(target_dir).each do |plat, value| 
         if new_spec_hash[plat]
           new_spec_hash[plat]["resource_bundles"] = value
@@ -202,7 +204,7 @@ module Pod
       UI.puts "fix xcframework-is-not-a-member-type-of-error:#{target_dir}"
       fix_xcframework_error(target_dir, @spec.name)
 
-      UI.puts "result export at :#{target_dir}"
+      UI.puts "result export at :#{target_dir} 生成成功".green
       target_dir
     end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-xcframework
 version: !ruby/object:Gem::Version
-  version: 0.2.6.3
+  version: 0.2.6.5
 platform: ruby
 authors:
 - humin
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-13 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.4.16
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: 把podspec打包成xcframework的小工具。packager pod to a xcframework
 test_files: