cocoapods-bb-xcframework 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f51e31cd2ec034bbc893a17b6335b903273fcd3eb0054cecd270bdf89c4483d3
-  data.tar.gz: 9ca7be68bdb56db497bd8c6a99e5870663f98458de65ddf9697c22a993bc5636
+  metadata.gz: 5e88b2bd7f6366b8ae972cff3c8fa603a7ed878b81b90b8820967f1572e47e52
+  data.tar.gz: bacf8b9ae537bab39b094555c0eb593b46770d4ef19db2a2f4a98119aaba6bbc
 SHA512:
-  metadata.gz: 2bc9b6c6c2051a583719ff4e10971387beecbb1a16662ca1c944beebbc9ca70963193e10d2dab59d18abd60d5483dae20c0c99067291441fa80f5b930dd55569
-  data.tar.gz: ddd788e2dbee253c008251002bb13c21417cf9b60049316e8b8cfefa1410bd9300b1116546b69347f087ac22059d3777877e8c4fdcfb0cc877358b58b6a166cc
+  metadata.gz: ab65288f3ff8891af5f60bf0d9ab628d427b2f7d14bb8db707b57dffc3c02eb1be7c7c98b696f571b3156715c04ef234c5ea83bdc52b5ff017819c59131cf96e
+  data.tar.gz: cdc4f5c8546499d55f870d26a8fa5e60221574618709d5a047f2036681cdb750e0f2d08bfb4fe826765b7a50a8c8418c25453208a5c8587fb5745afd58036c4a

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

@@ -34,7 +34,8 @@ module Pod
           ['--use-modular-headers', 'pakcage uses modular headers during packaging'],
           ['--no-static-library', 'package not use static library'],
           ['--enable-bitcode', 'package enable bitcode'],
-          ['--no-symbols', 'package not use symbols'] # 符号表
+          ['--no-symbols', 'package not use symbols'], # 符号表
+          ['--no-support-maccatalyst', 'package support generate MacCatalyst'] # 是否支持MacCatalyst方式支持iOS应用在mac平台运行库生成
         ].concat super
       end
 
@@ -50,6 +51,7 @@ module Pod
         @use_static_library = argv.flag?('static-library',true)
         @enable_bitcode = argv.flag?('enable-bitcode',false)
         @symbols = argv.flag?('symbols',true)
+        @support_maccatalyst = argv.flag?('support-maccatalyst',true)
         config.static_library_enable = @use_static_library
         super
       end
@@ -60,7 +62,7 @@ module Pod
       end
 
       def run
-        frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols)
+        frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst)
         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)
+    def initialize(name, source, spec_sources, subspecs, configuration, force, use_modular_headers=true, enable_bitcode=false, symbols=true, support_maccatalyst=true)
       @name = name
       @source = source
       @spec_sources = spec_sources
@@ -13,6 +13,7 @@ module Pod
       @use_modular_headers = use_modular_headers
       @enable_bitcode = enable_bitcode
       @symbols = symbols
+      @support_maccatalyst = support_maccatalyst
     end
 
     def run
@@ -60,7 +61,8 @@ module Pod
         sandbox_root,
         spec,
         @configuration,
-        @symbols
+        @symbols,
+        @support_maccatalyst
       )
       builder.build
       builder.outputs target_dir

data/lib/cocoapods-xcframework/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsXCFramework
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

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

@@ -1,13 +1,37 @@
 module Pod
   class XBuilder
     module XcodeXBuilder
-      def xcode_xbuild(defines, configuration, work_dir, build_dir = 'export')
+      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
-        command = "xcodebuild #{defines} BUILD_DIR=#{build_dir} BUILD_LIBRARY_FOR_DISTRIBUTION=YES clean build -configuration #{configuration} -alltargets 2>&1"
+        
+        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 i386 arm64'
+        else
+          destination = 'generic/platform=iOS'
+          archs = 'arm64 armv7'
+        end
+        if skip_install
+          skip_install = 'YES'
+        else
+          skip_install = 'NO'
+        end
+        if not project.nil?
+          if not scheme.nil?
+            command = "xcodebuild #{defines} BUILD_DIR=#{build_dir} BUILD_LIBRARY_FOR_DISTRIBUTION=YES clean build -configuration #{configuration} -project '#{project}' -scheme '#{scheme}' -destination '#{destination}' ARCHS='#{archs}' SKIP_INSTALL=#{skip_install} | xcpretty 2>&1"
+          else
+            command = "xcodebuild #{defines} BUILD_DIR=#{build_dir} BUILD_LIBRARY_FOR_DISTRIBUTION=YES clean build -configuration #{configuration} -alltargets -scheme '#{scheme}' -destination '#{destination}' ARCHS='#{archs}' SKIP_INSTALL=#{skip_install} | xcpretty 2>&1"
+          end
+        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

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)
+    def initialize(installer, source_dir, sandbox_root, spec, configuration, symbols=true, support_maccatalyst=true)
     # def initialize(platform, installer, source_dir, sandbox_root, spec, config)
         # @platform = platform
       @installer = installer
@@ -20,6 +20,7 @@ module Pod
       @configuration = configuration
       @outputs = Hash.new
       @symbols = symbols
+      @support_maccatalyst = support_maccatalyst
     end
 
     def build
@@ -135,6 +136,9 @@ module Pod
 
     def build_all_device defines
       # build general first because simulator will exchange SDKROOT to simulat sdk
+      if @support_maccatalyst
+        build_MacCatalyst_device defines
+      end
       build_general_device defines
       build_simulator_device defines
     end
@@ -154,7 +158,22 @@ module Pod
       xcode_xbuild(
         defines,
         @configuration,
-        @sandbox_root
+        @sandbox_root,
+        'export',
+        'iOS Simulator'
+      )
+    end
+
+    def build_MacCatalyst_device defines
+      UI.puts("--- Building framework #{@spec} with MacCatalyst device")
+      xcode_xbuild(
+        defines,
+        @configuration,
+        @sandbox_root,
+        'export',       # build_dir
+        'macOS',        # platform
+        "#{@sandbox_root}/Pods.xcodeproj", # project
+        "#{@spec.name}" # scheme
       )
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-xcframework
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2021-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods