cocoapods-bb-xcframework 0.2.7.2 → 0.2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff188e2f9fea6dd316ea3b6457e5cdca2229cefaac0274370cc6076ba4eb9dab
-  data.tar.gz: 1dc04ad72267df21e5da59ffaeae13a6b5695abc033b90c5d6dd819ead560108
+  metadata.gz: 597321612f6169b2c9f34b33ebbf775b50c23174c2059465953b94db815e7bc2
+  data.tar.gz: 9bda96e9b80a82a706c83b64b0d4b35d94cc27ab88742b63835b2dce0bb3a869
 SHA512:
-  metadata.gz: 60d70707d601d17160af83cf7ced3fdcf0466d97d1dfe29af81b3e02c4676170518a692e49ec8f44714a1154b7fb3d1369cd8545b449e35ba20e3e1baa34048a
-  data.tar.gz: 3385c50216a54cb109bec510654aa2718c256a1fb8edf71a505928046f4e88b49c9228298980333e9b563eab04a167d1d3c4a84455cdc3aa49851ce7e0cfc915
+  metadata.gz: 641d7d1659254d9c84e47df9e2edec74dd75a4592dab26aefd40d104fad2db87fcee9ee563c613c10f60385a84ba339c3ddb635e0bf014d0b35fc18645516209
+  data.tar.gz: 0b85260117e10d861e9e95d39e972a78820c6097cb509f8e5726d4298fd80837094a53c4fe6c02e31f9c6610150fd0d8faba063f541e76b1296a47aaaeb3c359

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

@@ -37,7 +37,8 @@ module Pod
           ['--no-symbols', 'package not use symbols'], # 符号表
           ['--no-support-maccatalyst', 'package support generate MacCatalyst'], # 是否支持MacCatalyst方式支持iOS应用在mac平台运行库生成
           ['--no-support-dynamic', 'package support Mach-O dynamically linked shared library'], # 是否支持动态库生成
-          ['--no-archive-export', 'xcodebuild archive export'] # 是否支持本地导出,导出dylib动态库
+          ['--no-archive-export', 'xcodebuild archive export'], # 是否支持本地导出,导出dylib动态库
+          ['--workspace', 'xcodebuild archive workspace'], # 工程目录
         ].concat super
       end
 
@@ -56,6 +57,7 @@ module Pod
         @support_maccatalyst = argv.flag?('support-maccatalyst',true)
         @support_dynamic = argv.flag?('support-dynamic',false)
         @archive_export = argv.flag?('archive-export',true)
+        @workspace = argv.option('workspace')
         config.static_library_enable = @use_static_library
         super
       end
@@ -66,14 +68,14 @@ module Pod
       end
 
       def run
-        UI.puts "argvs @name:#{@name} @source:#{@source} @spec_sources:#{@spec_sources} @subspecs:#{@subspecs} @archive_export:#{@archive_export}"
+        UI.puts "argvs @name:#{@name} @source:#{@source} @spec_sources:#{@spec_sources} @subspecs:#{@subspecs} @archive_export:#{@archive_export} @workspace:#{@workspace}"
         if @archive_export
           puts "local builder xcframework"
-          frameworker = LocalBuilder.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst, @support_dynamic, Dir.pwd)
+          frameworker = LocalBuilder.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst, @support_dynamic, Dir.pwd, @workspace)
           frameworker.build
         else
           puts "remote builder xcframework"
-          frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst, @support_dynamic)
+          frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst, @support_dynamic, @workspace)
           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, support_dynamic=false)
+    def initialize(name, source, spec_sources, subspecs, configuration, force, use_modular_headers=true, enable_bitcode=false, symbols=true, support_maccatalyst=true, support_dynamic=false, workspace=nil)
       @name = name
       @source = source
       @spec_sources = spec_sources
@@ -15,6 +15,26 @@ module Pod
       @symbols = symbols
       @support_maccatalyst = support_maccatalyst
       @support_dynamic = support_dynamic
+      @workspace = workspace
+    end
+
+    # 是否支持macos架构
+    def support_macos
+      spec = spec_with_path @name
+      platforms = []
+      begin
+        spec_hash = spec.to_hash
+        if spec_hash['platforms']
+          platforms = spec_hash['platforms'].keys.map(&:to_s)
+        elsif spec.platform
+          platforms = [spec.platform.name.to_s]
+        end
+      rescue => e
+        UI.puts "read platforms failed: #{e}".red
+      end
+      support_macos = platforms.include?('osx') || platforms.include?('macos')
+      UI.puts "#{spec.name}(#{spec.version}) platforms=#{platforms} support_macos=#{support_macos}".yellow
+      return support_macos
     end
 
     def run
@@ -65,7 +85,8 @@ module Pod
         spec,
         @configuration,
         @symbols,
-        @support_maccatalyst
+        @support_maccatalyst,
+        support_macos
       )
       builder.build
       builder.outputs target_dir

data/lib/cocoapods-xcframework/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsXCFramework
-  VERSION = "0.2.7.2"
+  VERSION = "0.2.7.3"
 end

data/lib/cocoapods-xcframework/local_build.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, support_dynamic=false, source_dir=Dir.pwd)
+    def initialize(name, source, spec_sources, subspecs, configuration, force, use_modular_headers=true, enable_bitcode=false, symbols=true, support_maccatalyst=true, support_dynamic=false, source_dir=Dir.pwd, workspace=nil)
       @name = name
       @source = source
       @spec_sources = spec_sources
@@ -18,6 +18,7 @@ module Pod
       @spec = spec_with_path @name
       @source_dir = source_dir
       @outputs = Hash.new
+      @workspace = workspace
     end
 
     def run
@@ -49,31 +50,71 @@ module Pod
       outputs(target_dir)
     end
 
+    # 是否支持macos架构
+    def support_macos
+      spec = spec_with_path @name
+      platforms = []
+      begin
+        spec_hash = spec.to_hash
+        if spec_hash['platforms']
+          platforms = spec_hash['platforms'].keys.map(&:to_s)
+        elsif spec.platform
+          platforms = [spec.platform.name.to_s]
+        end
+      rescue => e
+        UI.puts "read platforms failed: #{e}".red
+      end
+      support_macos = platforms.include?('osx') || platforms.include?('macos')
+      UI.puts "#{spec.name}(#{spec.version}) platforms=#{platforms} support_macos=#{support_macos}".yellow
+      return support_macos
+    end
+
     def xcode_xbuild(destination, archs, platform, defines, build_dir, archive_path)
         # xcodebuild archive requires -scheme when -archivePath is specified
         spec = spec_with_path @name
         spec ||= spec_with_name @name
         
+        workspace_path = @workspace
         scheme_name = @spec&.name
         configuration = @configuration
         skip_install = 'NO'
         plat_name   = platform.to_s.gsub(/\s+/, '_')
-        archivePath = "#{archive_path}/#{scheme_name}-#{plat_name}.xcarchive"
-        UI.puts "archivePath:#{archivePath}"
+        target_name = "#{scheme_name}-#{plat_name}"
+        archivePath = "#{archive_path}/#{target_name}.xcarchive"
+        UI.puts "plat_name=#{plat_name} destination=#{destination} archs=#{archs} workspace_path=#{workspace_path}"
         if scheme_name.nil?
           UI.puts("❌ archive 构建缺少 scheme，请在调用 xcode_xbuild 时显式传入 scheme").red
           Process.exit 1
         end
+
+        workspace_arg = if workspace_path && !workspace_path.to_s.strip.empty?
+                          "-workspace '#{workspace_path}' "
+                        else
+                          ""
+                        end
+
+        scheme_arg = if workspace_path && !workspace_path.to_s.strip.empty?
+                        if platform == "iOS" or platform == "Simulator" or platform == "MacCatalyst"
+                          "#{scheme_name}-iOS"
+                        else
+                          "#{scheme_name}-macOS"
+                        end
+                     else
+                       scheme_name
+                     end
+
         command = "xcodebuild archive " \
-                  "-scheme '#{scheme_name}' " \
+                  "#{workspace_arg}" \
+                  "-scheme '#{scheme_arg}' " \
                   "-archivePath '#{archivePath}' " \
                   "-destination '#{destination}' " \
+                  "-alltargets " \
                   "-configuration #{configuration} " \
                   "ARCHS='#{archs}' " \
                   "SKIP_INSTALL=#{skip_install} " \
                   "#{defines} " \
                   "SWIFT_OPTIMIZATION_LEVEL=-Onone DEBUG_INFORMATION_FORMAT=dwarf-with-dsym " \
-                  "BUILD_LIBRARY_FOR_DISTRIBUTION=YES  clean build" \
+                  "BUILD_LIBRARY_FOR_DISTRIBUTION=YES clean build"
 
         # --- enhanced logging & reliable failure surfacing ---
         log_dir  = File.join(archivePath, 'logs')
@@ -105,7 +146,15 @@ module Pod
       # build general first because simulator will exchange SDKROOT to simulat sdk
       build_general_device defines, build_dir, archive_path
       build_simulator_device defines, build_dir, archive_path
-      build_MacCatalyst_device defines, build_dir, archive_path if @support_maccatalyst
+      # build_MacCatalyst_device defines, build_dir, archive_path if @support_maccatalyst
+      build_mac_device defines, build_dir, archive_path if support_macos
+    end
+
+    def build_mac_device defines, build_dir, archive_path
+        UI.puts("--- Building framework #{@spec} with general device")
+        destination = 'generic/platform=macOS'
+        archs = 'arm64'
+        xcode_xbuild(destination, archs, "macOS", defines, build_dir, archive_path)
     end
 
     def build_general_device defines, build_dir, archive_path
@@ -174,7 +223,7 @@ module Pod
         "-output '#{xcframework_path}'"
       ].join(' ')
 
-      UI.puts "� Creating XCFramework:"
+      UI.puts "� Creating XCFramework:#{command}"
       UI.puts command.cyan
 
       success = system(command)

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

@@ -30,6 +30,7 @@ module Pod
       end
       
       def xcode_xbuild(defines, configuration, work_dir, build_dir = 'export', platform = 'iOS', project = nil, scheme = nil, skip_install = false)
+        puts "xcode_xbuild defines:#{defines} configuration:#{configuration} work_dir:#{work_dir} build_dir:#{build_dir} project:#{project} scheme:#{scheme}"
         if defined?(Pod::DONT_CODESIGN)
           defines = "#{defines} CODE_SIGN_IDENTITY=\"\" CODE_SIGNING_REQUIRED=NO"
         end
@@ -38,9 +39,12 @@ module Pod
         # 判断当前Xcode版本是否大于14
         above_ver_14 = compare_xcode_14_version
         
-        if platform == 'macOS'
+        if platform == 'MacCatalyst'
           destination = 'generic/platform=macOS,variant=Mac Catalyst,name=Any Mac'
           archs = 'x86_64 arm64'
+        elsif platform == 'macOS'
+          destination = 'generic/platform=macOS'
+          archs = 'arm64'
         elsif platform == 'iOS Simulator'
           destination = 'generic/platform=iOS Simulator'
           if above_ver_14 # 14以后不支持32位设备

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_macos=false)
     # def initialize(platform, installer, source_dir, sandbox_root, spec, config)
         # @platform = platform
       @installer = installer
@@ -21,6 +21,7 @@ module Pod
       @outputs = Hash.new
       @symbols = symbols
       @support_maccatalyst = support_maccatalyst
+      @support_macos = support_macos
     end
 
     def build
@@ -139,6 +140,7 @@ module Pod
       build_general_device defines
       build_simulator_device defines
       build_MacCatalyst_device defines if @support_maccatalyst
+      build_MacOS_device defines if @support_macos
     end
 
     def build_general_device defines
@@ -164,6 +166,19 @@ module Pod
 
     def build_MacCatalyst_device defines
       UI.puts("--- Building framework #{@spec} with MacCatalyst device")
+      xcode_xbuild(
+        defines,
+        @configuration,
+        @sandbox_root,
+        'export',       # build_dir
+        'MacCatalyst',        # platform
+        "#{@sandbox_root}/Pods.xcodeproj", # project
+        "#{@spec.name}" # scheme
+      )
+    end
+
+    def build_MacOS_device defines
+      UI.puts("--- Building framework #{@spec} with macOS device")
       xcode_xbuild(
         defines,
         @configuration,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-xcframework
 version: !ruby/object:Gem::Version
-  version: 0.2.7.2
+  version: 0.2.7.3
 platform: ruby
 authors:
 - humin