cocoapods-bb-xcframework 0.2.2 → 0.2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1033333c183bcba6eecae0b499ca65995cb308abf2d572a692af8ef572bff304
-  data.tar.gz: 83786e9d5fb0d798fb34ed2ac6f9eabc3e5d34d7884366260d2661dd0e6ee4d2
+  metadata.gz: 44334b003db5f637575546f87da1abf68deb9aa4d31a4c1b23884ffa5d0dc96a
+  data.tar.gz: 14591a0139ff117858f596ef6449260da925cfec90fe1692516758cd6eb7d824
 SHA512:
-  metadata.gz: 9f5c2511a1eed68f90c85b0106cfa2101058498b7589b493ee5270efb2ced1798b898d719405c2174c861abda8535f226659d293cd185438cf44ada06756cbfc
-  data.tar.gz: 86fd0c94f701825988c8f544e350fff888e36400062661e974af556ee7d0a16c3d0e8dbc84fb510d1531b333cb6eebaee87b494bbc2d798339806870cd008353
+  metadata.gz: cef57cd8d3655596578026c28a133ffa16f5fe13096fe4d78f4f05475574abc8d7539f5d3cb819c3975a0c15cd9cabe5af77504592deedb66ee847c0151ed55a
+  data.tar.gz: e13aba5936cf45104896b913cc994f5b0ab273e2694bb8cd462837a95cde2b3ac6f0d1a66e6ce5a2eb5d4e2fbf67e0438e8da3dde5d9e7baaaecae642c4177d1

data/lib/cocoapods-xcframework/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsXCFramework
-  VERSION = "0.2.2"
+  VERSION = "0.2.4.1"
 end

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

@@ -13,8 +13,8 @@ module Pod
           archs = 'x86_64 arm64'
         elsif platform == 'iOS Simulator'
           destination = 'generic/platform=iOS Simulator'
-          archs = 'x86_64 arm64'
-          # archs = 'x86_64 i386 arm64' # 某些库不支持i386故去除 by hm 21/11/5
+          # archs = 'x86_64 arm64'
+          archs = 'x86_64 i386 arm64' # swift库针对M1芯片移除x86架构，故模拟器添加i386，解决maccatalyst能正常生成
         else
           destination = 'generic/platform=iOS'
           archs = 'arm64 armv7'

data/lib/cocoapods-xcframework/xbuilder.rb

@@ -198,9 +198,24 @@ module Pod
       File.open("#{target_dir}/#{@spec.name}.podspec.json",'wb+') do |f|
         f.write(spec_json)
       end
+      # fix xcframework-is-not-a-member-type-of-error https://v3.bbcloud.babybus.com/team/184/wiki/13820
+      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}"
       target_dir
     end
+
+    def fix_xcframework_error target_dir, name
+      command = "find #{target_dir} -name '*.swiftinterface' -exec sed -i -e 's/#{name}\\.//g' {} \\; && find #{target_dir} -name '*.swiftinterface-e' | xargs rm -rf"
+      UI.puts "fix swift error command :#{command}"
+
+      output = `#{command}`.lines.to_a
+      if $?.exitstatus != 0
+        Pod::ErrorUtil.error_report command,output
+        Process.exit -1
+      end
+    end
     
     def find_bundles target_dir
       bundle_root = "#{target_dir}/bundle/"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-xcframework
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4.1
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.30
+rubygems_version: 3.4.3
 signing_key:
 specification_version: 4
 summary: 把podspec打包成xcframework的小工具。packager pod to a xcframework