cocoapods-bb-xcframework 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e88b2bd7f6366b8ae972cff3c8fa603a7ed878b81b90b8820967f1572e47e52
-  data.tar.gz: bacf8b9ae537bab39b094555c0eb593b46770d4ef19db2a2f4a98119aaba6bbc
+  metadata.gz: da22b9bd9e4143282a7d36cf38643b76226d25bc6ffc203ba3ee9139ff7f5111
+  data.tar.gz: 62de8d3533817f793a9028ff6cb54d79e7e10f008aa61a86926c2aae3ceb6461
 SHA512:
-  metadata.gz: ab65288f3ff8891af5f60bf0d9ab628d427b2f7d14bb8db707b57dffc3c02eb1be7c7c98b696f571b3156715c04ef234c5ea83bdc52b5ff017819c59131cf96e
-  data.tar.gz: cdc4f5c8546499d55f870d26a8fa5e60221574618709d5a047f2036681cdb750e0f2d08bfb4fe826765b7a50a8c8418c25453208a5c8587fb5745afd58036c4a
+  metadata.gz: 13f2be4aa49034fb2238cbefd36b64c1609d8b3656d3a33be4ad3e34a520c5b1369d35b6a23d13130c61d8de8fa17f884ca0b7979c1aebd97f28c0479eb34d7d
+  data.tar.gz: fede30f63e0e60d09cee70ae9ed43bbab26063155095c1192df3e04db7f0041f45c4f8fc9bddab0010667e1994ec2361cf873adcd6705cc872ce3cced9df3fa6

data/lib/cocoapods-xcframework/gem_version.rb

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

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

@@ -84,6 +84,9 @@ module Pod
               configuration.build_settings['ENABLE_BITCODE'] = 'YES'
               configuration.build_settings['BITCODE_GENERATION_MODE'] = 'bitcode'
             end
+            ### support MacCatalyst 默认生成工程不支持 by hm 21/11/3
+            configuration.build_settings['SUPPORTS_MACCATALYST'] = 'YES'
+            ### support MacCatalyst end
           end
           if target.name == spec.name
             target.build_configurations.each do |configuration|
@@ -117,6 +120,9 @@ module Pod
               configuration.build_settings['ENABLE_BITCODE'] = 'YES'
               configuration.build_settings['BITCODE_GENERATION_MODE'] = 'bitcode'
             end
+            ### support MacCatalyst 默认生成工程不支持 by hm 21/11/3
+            configuration.build_settings['SUPPORTS_MACCATALYST'] = 'YES'
+            ### support MacCatalyst end
           end
           if specs.include? target.name
             target.build_configurations.each do |configuration|

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

@@ -24,11 +24,12 @@ module Pod
           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
+          # 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
+          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"
         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

data/lib/cocoapods-xcframework/xbuilder.rb

@@ -136,11 +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
+      build_MacCatalyst_device defines if @support_maccatalyst
     end
 
     def build_general_device defines

metadata

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