cocoapods-bb-xcframework 0.2.6.1 → 0.2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08c6a4feaf42fcaf08cf0850541fd0d64f28e2f35fce462bee195625b3aa02b1'
-  data.tar.gz: 2d10b0fdf6c83246d5858f21edade1cfa6c731099c3eae9931303144eecafd5b
+  metadata.gz: be757b65dcad2eee788c536a5546173235e0763e8e55df3a935811554de77afd
+  data.tar.gz: 485a105ead0d091f645b49ad59a0da64afe3d4510ab2654e4215dfbb007fb7ca
 SHA512:
-  metadata.gz: 21f47c1d01df0b98de368bb131f6f2f384f180c429f10bb20d7ff96d18cc19ed74d41747c517f0c1b94e743d6a6d75762e0656aeb9d82a220eecc69af61a8401
-  data.tar.gz: 19ab879bc014ef08bd422ba70fdd9e6caed3e8f5b0b8b802b7af8f4f5b493fea78fbe3674ca6fd028de95b0de03bdefebfe5e8b1fef0997090b60b32ae7405c3
+  metadata.gz: 161d22ffdf76f7af4753ebdbd8866b54c754855700d4b833b38cf80495690e98a18482e55bf1abca9ffaa99631279fe91cc581a9cc1cfac06d8d66b4250563d5
+  data.tar.gz: b65ef5e847ace4cb2ac17d9e1c52c4e61fc8a839758aa839e1e4a019b109c64e8bc9687beacb07c606ba8fd26be007b93cb1c3714004875e4207fc60ca37102d

data/lib/cocoapods-xcframework/frameworker.rb

@@ -65,8 +65,7 @@ module Pod
         spec,
         @configuration,
         @symbols,
-        @support_maccatalyst,
-        @support_dynamic
+        @support_maccatalyst
       )
       builder.build
       builder.outputs target_dir

data/lib/cocoapods-xcframework/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsXCFramework
-  VERSION = "0.2.6.1"
+  VERSION = "0.2.6.3"
 end

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

@@ -84,7 +84,26 @@ module Pod
           key = configuration[0]
           if key == 'frameworks'
             val = configuration[1]
-            other_flags << "-framework #{val} "
+            if val.is_a? String
+              other_flags << "-framework #{val} "
+            elsif val.is_a? Array
+              val.uniq.each do |item|
+                other_flags << "-framework #{item} "
+              end
+            else
+              UI.puts "framework configuration:#{configuration} val:#{val}"
+            end
+          elsif key == 'libraries'
+            val = configuration[1]
+            if val.is_a? String
+              other_flags << "-l #{val} "
+            elsif val.is_a? Array
+              val.uniq.each do |item|
+                other_flags << "-l #{item} "
+              end
+            else
+              UI.puts "libraries configuration:#{configuration} val:#{val}"
+            end
           end
         end
       end
@@ -113,6 +132,11 @@ module Pod
                 UI.puts "configuration other_flags: #{other_flags}"
                 configuration.build_settings['OTHER_LDFLAGS'] = "#{other_flags}"
               end
+              if support_dynamic
+                configuration.build_settings['MACH_O_TYPE'] = 'mh_dylib'
+              else
+                configuration.build_settings['MACH_O_TYPE'] = 'staticlib'
+              end
             end
           end
         end

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, support_dynamic=false)
+    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
@@ -21,35 +21,20 @@ 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} isSymbols:#{@symbols} isDynamic:#{@support_dynamic}"
+      UI.puts "Work dir is :#{@sandbox_root} isSymbols:#{@symbols}"
       # defines = "GCC_PREPROCESSOR_DEFINITIONS='$(inherited) PodsDummy_Pods_#{@spec.name}=PodsDummy_PodPackage_#{@spec.name}'"
       defines = ""
       if @configuration == 'Debug'
-        if @support_dynamic
-          defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES ONLY_ACTIVE_ARCH=NO MACH_O_TYPE=mh_dylib'
-        else
-          defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES ONLY_ACTIVE_ARCH=NO MACH_O_TYPE=staticlib'
-        end
+        defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES ONLY_ACTIVE_ARCH=NO'
       else
         if @symbols
-          if @support_dynamic
-            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES MACH_O_TYPE=mh_dylib'
-          else
-            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES MACH_O_TYPE=staticlib'
-          end
-          # defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=YES" # Release模式需要符号表应于问题排查(二进制切源码操作) by hm 21/10/13
+          defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=YES" # Release模式需要符号表应于问题排查(二进制切源码操作) by hm 21/10/13
         else
-          if @support_dynamic
-            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=NO MACH_O_TYPE=mh_dylib'
-          else
-            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=NO MACH_O_TYPE=staticlib'
-          end
-          # defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=NO" # 去除符号表
+          defines << "GCC_GENERATE_DEBUGGING_SYMBOLS=NO" # 去除符号表
         end
       end
       

metadata

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