cocoapods-bb-xcframework 0.2.4.1 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44334b003db5f637575546f87da1abf68deb9aa4d31a4c1b23884ffa5d0dc96a
-  data.tar.gz: 14591a0139ff117858f596ef6449260da925cfec90fe1692516758cd6eb7d824
+  metadata.gz: f98fbc6d1facd7259f106f15bc4baae1d7d42e4fbdde07f87e2418ad5d631631
+  data.tar.gz: ac5b4b39621ccb83012f6dbb22e136495e00bf0b75177a8f49eabb16d631019f
 SHA512:
-  metadata.gz: cef57cd8d3655596578026c28a133ffa16f5fe13096fe4d78f4f05475574abc8d7539f5d3cb819c3975a0c15cd9cabe5af77504592deedb66ee847c0151ed55a
-  data.tar.gz: e13aba5936cf45104896b913cc994f5b0ab273e2694bb8cd462837a95cde2b3ac6f0d1a66e6ce5a2eb5d4e2fbf67e0438e8da3dde5d9e7baaaecae642c4177d1
+  metadata.gz: f949933c7e4c8d292583e1d6b228bb1ee312dc05d34c2d7dc7fce4d25dab8af19b1ad855f1388ca482e9d0c7fef53f3206f231127437131f381e1e6a0952dc15
+  data.tar.gz: 3ca5be14ad4b76e620849d0bc85be6e9a4c8cef510942be395ce9e8b4151e834f44f38892f3492c9e5755444bc6380ba9f88d71e2ef021b2d02371ae0dcf827d

data/README.md

@@ -12,7 +12,8 @@
 - 支持 `Xcode` 新特性: `xcframework`
 - 支持 `cocoapods` 绝大多数属性
 - 支持 `subspec` 打包
-- 支持二进制库是否生成符号表，默认生成，详见`pod xcframework --help`
+- 支持二进制库是否`生成符号表`、`生成Mac Catalyst`（默认生成）详见`pod xcframework --help`
+- 支持Xcode14打包，去除armv7/i386架构
 
 ## Installation
 
@@ -57,6 +58,9 @@ Options:
                                                                     bitcode
     --no-symbols                                                    package not use
                                                                     symbols
+    --no-support-maccatalyst                                        package support
+                                                                    generate
+                                                                    MacCatalyst
     --allow-root                                                    Allows CocoaPods
                                                                     to run as root
     --silent                                                        Show nothing

data/lib/cocoapods-xcframework/gem_version.rb

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

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

@@ -241,7 +241,7 @@ module Pod
       Dir.glob("#{xcframework_path}/*/").each do |file|
         ['ios','macos','tvos', 'watchos'].each do |prefix|
           last_path = file.split("/").last
-          if last_path =~ /#{prefix}/ and not last_path =~ /simulator/
+          if last_path =~ /#{prefix}/ and not last_path =~ /simulator/ and not last_path =~ /maccatalyst/
             platform = to_native_platform prefix
             if spec_hash[platform]
               spec_hash[platform]["public_header_files"] = "#{spec_hash[:vendored_frameworks]}/#{last_path}/*/Headers/*.h"

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

@@ -1,23 +1,60 @@
 module Pod
   class XBuilder
     module XcodeXBuilder
+      # 调用方法来获取当前Xcode版本
+      def xcode_version
+        xcode_version_output = `xcode-select -p`
+        return nil if xcode_version_output.empty?
+        
+        xcode_path = xcode_version_output.chomp
+        version_output = `xcodebuild -version`
+        
+        # Extract the Xcode version number
+        version_match = version_output.match(/Xcode (\d+(\.\d+)+)/)
+        return nil if version_match.nil?
+        
+        xcode_version = version_match[1]
+        return xcode_version
+      end
+      # xcode14以上，14以后不再支持armv7（32位设备）
+      def compare_xcode_14_version
+        current_version = xcode_version
+        if current_version.nil?
+          UI.puts("未找到安装的Xcode版本。")
+        else
+          UI.puts("当前Xcode版本：#{current_version}")
+          num_ver = current_version.to_i
+          return  num_ver >= 14
+        end
+        return false
+      end
+      
       def xcode_xbuild(defines, configuration, work_dir, build_dir = 'export', platform = 'iOS', project = nil, scheme = nil, skip_install = false)
         if defined?(Pod::DONT_CODESIGN)
           defines = "#{defines} CODE_SIGN_IDENTITY=\"\" CODE_SIGNING_REQUIRED=NO"
         end
         pwd = Pathname.pwd
         Dir.chdir work_dir
+        # 判断当前Xcode版本是否大于14
+        above_ver_14 = compare_xcode_14_version
         
         if platform == 'macOS'
           destination = 'generic/platform=macOS,variant=Mac Catalyst,name=Any Mac'
           archs = 'x86_64 arm64'
         elsif platform == 'iOS Simulator'
           destination = 'generic/platform=iOS Simulator'
-          # archs = 'x86_64 arm64'
-          archs = 'x86_64 i386 arm64' # swift库针对M1芯片移除x86架构，故模拟器添加i386，解决maccatalyst能正常生成
+          if above_ver_14 # 14以后不支持32位设备
+            archs = 'x86_64 arm64'
+          else
+            archs = 'x86_64 i386 arm64' # swift库针对M1芯片移除x86架构，故模拟器添加i386，解决maccatalyst能正常生成
+          end
         else
           destination = 'generic/platform=iOS'
-          archs = 'arm64 armv7'
+          if above_ver_14 # 14以后不支持32位设备
+            archs = 'arm64'
+          else
+            archs = 'arm64 armv7'
+          end
         end
         if skip_install
           skip_install = 'YES'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-xcframework
 version: !ruby/object:Gem::Version
-  version: 0.2.4.1
+  version: 0.2.5
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-05-31 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.4.3
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: 把podspec打包成xcframework的小工具。packager pod to a xcframework