cocoapods-bb-xcframework 0.2.4.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44334b003db5f637575546f87da1abf68deb9aa4d31a4c1b23884ffa5d0dc96a
-  data.tar.gz: 14591a0139ff117858f596ef6449260da925cfec90fe1692516758cd6eb7d824
+  metadata.gz: 22e95ef47a755371fe5138674d018ed4a05e4ec8d54806fe57e7cbdc95c3bca3
+  data.tar.gz: 91127f23608399c2031ef9245d4e194fca6f63f2a87763ac5cc6f5d8349a261d
 SHA512:
-  metadata.gz: cef57cd8d3655596578026c28a133ffa16f5fe13096fe4d78f4f05475574abc8d7539f5d3cb819c3975a0c15cd9cabe5af77504592deedb66ee847c0151ed55a
-  data.tar.gz: e13aba5936cf45104896b913cc994f5b0ab273e2694bb8cd462837a95cde2b3ac6f0d1a66e6ce5a2eb5d4e2fbf67e0438e8da3dde5d9e7baaaecae642c4177d1
+  metadata.gz: 5c673977a36ecff7e43e0817af91471f60aeb56b52074386aead8222b374d5d86358b1e392938d6e0704fe6b6f8237fd33c057ffd5cb380c414e326f0713b807
+  data.tar.gz: ba6d977bee0cfea4d35f55bba4bc184661168cb753d4729734bd6df6f5a98326ac97b9bde04edb819caefedacb9226ee7491a78ecf913325c0565a5ed80d1131

data/README.md

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

data/lib/cocoapods-xcframework/command/xcframework.rb

@@ -35,7 +35,8 @@ module Pod
           ['--no-static-library', 'package not use static library'],
           ['--enable-bitcode', 'package enable bitcode'],
           ['--no-symbols', 'package not use symbols'], # 符号表
-          ['--no-support-maccatalyst', 'package support generate MacCatalyst'] # 是否支持MacCatalyst方式支持iOS应用在mac平台运行库生成
+          ['--no-support-maccatalyst', 'package support generate MacCatalyst'], # 是否支持MacCatalyst方式支持iOS应用在mac平台运行库生成
+          ['--no-support-dynamic', 'package support Mach-O dynamically linked shared library'] # 是否支持动态库生成
         ].concat super
       end
 
@@ -52,6 +53,7 @@ module Pod
         @enable_bitcode = argv.flag?('enable-bitcode',false)
         @symbols = argv.flag?('symbols',true)
         @support_maccatalyst = argv.flag?('support-maccatalyst',true)
+        @support_dynamic = argv.flag?('support-dynamic',false)
         config.static_library_enable = @use_static_library
         super
       end
@@ -62,7 +64,7 @@ module Pod
       end
 
       def run
-        frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst)
+        frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst, @support_dynamic)
         frameworker.run
       end
     end

data/lib/cocoapods-xcframework/frameworker.rb

@@ -3,7 +3,7 @@ module Pod
     include PodUtil
     include DirUtil
     include Config::Mixin
-    def initialize(name, source, spec_sources, subspecs, configuration, force, use_modular_headers=true, enable_bitcode=false, symbols=true, support_maccatalyst=true)
+    def initialize(name, source, spec_sources, subspecs, configuration, force, use_modular_headers=true, enable_bitcode=false, symbols=true, support_maccatalyst=true, support_dynamic=false)
       @name = name
       @source = source
       @spec_sources = spec_sources
@@ -14,6 +14,7 @@ module Pod
       @enable_bitcode = enable_bitcode
       @symbols = symbols
       @support_maccatalyst = support_maccatalyst
+      @support_dynamic = support_dynamic
     end
 
     def run
@@ -62,7 +63,8 @@ module Pod
         spec,
         @configuration,
         @symbols,
-        @support_maccatalyst
+        @support_maccatalyst,
+        @support_dynamic
       )
       builder.build
       builder.outputs target_dir

data/lib/cocoapods-xcframework/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsXCFramework
-  VERSION = "0.2.4.1"
+  VERSION = "0.2.6"
 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'

data/lib/cocoapods-xcframework/xbuilder.rb

@@ -6,7 +6,7 @@ module Pod
     include XcodeProjHelper
     include PodUtil
     include Config::Mixin
-    def initialize(installer, source_dir, sandbox_root, spec, configuration, symbols=true, support_maccatalyst=true)
+    def initialize(installer, source_dir, sandbox_root, spec, configuration, symbols=true, support_maccatalyst=true, support_dynamic=false)
     # def initialize(platform, installer, source_dir, sandbox_root, spec, config)
         # @platform = platform
       @installer = installer
@@ -21,23 +21,38 @@ module Pod
       @outputs = Hash.new
       @symbols = symbols
       @support_maccatalyst = support_maccatalyst
+      @support_dynamic = support_dynamic
     end
 
     def build
       UI.puts("Building framework #{@spec} with configuration #{@configuration}")
-      UI.puts "Work dir is :#{@sandbox_root}"
+      UI.puts "Work dir is :#{@sandbox_root} isSymbols:#{@symbols} isDynamic:#{@support_dynamic}"
       # defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited) PodsDummy_Pods_#{@spec.name}=PodsDummy_PodPackage_#{@spec.name}'"
       defines = ""
       if @configuration == 'Debug'
-        defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES ONLY_ACTIVE_ARCH=NO'
+        if @support_dynamic
+          defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES ONLY_ACTIVE_ARCH=NO MACH_O_TYPE=mh_dylib OTHER_LDFLAGS="-ObjC -framework UIKit"' # OTHER_LDFLAGS 动态库工程不会自动导入系统库
+        else
+          defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES ONLY_ACTIVE_ARCH=NO MACH_O_TYPE=staticlib'
+        end
       else
         if @symbols
-          defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=YES" # Release模式需要符号表应于问题排查(二进制切源码操作) by hm 21/10/13
+          if @support_dynamic
+            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES MACH_O_TYPE=mh_dylib OTHER_LDFLAGS="-ObjC -framework UIKit"' # OTHER_LDFLAGS 动态库工程不会自动导入系统库
+          else
+            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES MACH_O_TYPE=staticlib'
+          end
+          # defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=YES" # Release模式需要符号表应于问题排查(二进制切源码操作) by hm 21/10/13
         else
-          defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=NO" # 去除符号表
+          if @support_dynamic
+            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=NO MACH_O_TYPE=mh_dylib OTHER_LDFLAGS="-ObjC -framework UIKit"' # OTHER_LDFLAGS 动态库工程不会自动导入系统库
+          else
+            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=NO MACH_O_TYPE=staticlib'
+          end
+          # defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=NO" # 去除符号表
         end
       end
-
+      
       build_all_device defines
 
       collect_xc_frameworks

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.6
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-07-12 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.14
 signing_key:
 specification_version: 4
 summary: 把podspec打包成xcframework的小工具。packager pod to a xcframework