cocoapods-bb-xcframework 0.2.6 → 0.2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22e95ef47a755371fe5138674d018ed4a05e4ec8d54806fe57e7cbdc95c3bca3
-  data.tar.gz: 91127f23608399c2031ef9245d4e194fca6f63f2a87763ac5cc6f5d8349a261d
+  metadata.gz: '08c6a4feaf42fcaf08cf0850541fd0d64f28e2f35fce462bee195625b3aa02b1'
+  data.tar.gz: 2d10b0fdf6c83246d5858f21edade1cfa6c731099c3eae9931303144eecafd5b
 SHA512:
-  metadata.gz: 5c673977a36ecff7e43e0817af91471f60aeb56b52074386aead8222b374d5d86358b1e392938d6e0704fe6b6f8237fd33c057ffd5cb380c414e326f0713b807
-  data.tar.gz: ba6d977bee0cfea4d35f55bba4bc184661168cb753d4729734bd6df6f5a98326ac97b9bde04edb819caefedacb9226ee7491a78ecf913325c0565a5ed80d1131
+  metadata.gz: 21f47c1d01df0b98de368bb131f6f2f384f180c429f10bb20d7ff96d18cc19ed74d41747c517f0c1b94e743d6a6d75762e0656aeb9d82a220eecc69af61a8401
+  data.tar.gz: 19ab879bc014ef08bd422ba70fdd9e6caed3e8f5b0b8b802b7af8f4f5b493fea78fbe3674ca6fd028de95b0de03bdefebfe5e8b1fef0997090b60b32ae7405c3

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

@@ -64,6 +64,7 @@ module Pod
       end
 
       def run
+        UI.puts "argvs @name:#{@name} @source:#{@source} @spec_sources:#{@spec_sources}"
         frameworker = Frameworker.new(@name, @source, @spec_sources, @subspecs, @configuration, @force, @use_modular_headers, @enable_bitcode, @symbols, @support_maccatalyst, @support_dynamic)
         frameworker.run
       end

data/lib/cocoapods-xcframework/frameworker.rb

@@ -19,6 +19,7 @@ module Pod
 
     def run
       spec = spec_with_path @name
+      UI.warn "正在生成XCFramework #{spec.name}(#{spec.version})"
       @is_spec_from_path = true if spec
       spec ||= spec_with_name @name
 
@@ -42,7 +43,8 @@ module Pod
         @spec_sources,
         true,
         @use_modular_headers,
-        @enable_bitcode
+        @enable_bitcode,
+        @support_dynamic
       )
 
       perform_build(

data/lib/cocoapods-xcframework/gem_version.rb

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

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

@@ -63,7 +63,7 @@ module Pod
       Sandbox.new(config.sandbox_root)
     end
 
-    def installation_root sandbox, spec, subspecs, sources,use_frameworks = true,use_modular_headers = true, enable_bitcode = false
+    def installation_root sandbox, spec, subspecs, sources,use_frameworks = true,use_modular_headers = true, enable_bitcode = false, support_dynamic=false
         podfile = podfile_from_spec(
         @path,
         spec,
@@ -72,6 +72,23 @@ module Pod
         use_frameworks,
         use_modular_headers
       )
+      other_flags=""
+      if support_dynamic
+        # 解析podspec获取依赖关系
+        spec.dependencies.uniq.each do |dependency|
+          other_flags << "-framework #{dependency.name} "
+        end
+        # spec.frameworks系统库没有提供公共方法，故手动解析引用系统库
+        spec_hash = spec.to_hash
+        spec_hash.uniq.each do |configuration|
+          key = configuration[0]
+          if key == 'frameworks'
+            val = configuration[1]
+            other_flags << "-framework #{val} "
+          end
+        end
+      end
+      UI.puts "support_dynamic:#{support_dynamic} other_flags: #{other_flags}"
 
       installer = Installer.new(sandbox, podfile)
       installer.repo_update = true
@@ -91,6 +108,11 @@ module Pod
           if target.name == spec.name
             target.build_configurations.each do |configuration|
               configuration.build_settings['CLANG_MODULES_AUTOLINK'] = 'NO'
+              # 动态链接库需要配置project工程库依赖，否则导致无法编译通过 by hm 23/7/13
+              if !other_flags.empty?
+                UI.puts "configuration other_flags: #{other_flags}"
+                configuration.build_settings['OTHER_LDFLAGS'] = "#{other_flags}"
+              end
             end
           end
         end

data/lib/cocoapods-xcframework/xbuilder.rb

@@ -31,21 +31,21 @@ module Pod
       defines = ""
       if @configuration == 'Debug'
         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 动态库工程不会自动导入系统库
+          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
       else
         if @symbols
           if @support_dynamic
-            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=YES MACH_O_TYPE=mh_dylib OTHER_LDFLAGS="-ObjC -framework UIKit"' # OTHER_LDFLAGS 动态库工程不会自动导入系统库
+            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
         else
           if @support_dynamic
-            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=NO MACH_O_TYPE=mh_dylib OTHER_LDFLAGS="-ObjC -framework UIKit"' # OTHER_LDFLAGS 动态库工程不会自动导入系统库
+            defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=NO MACH_O_TYPE=mh_dylib'
           else
             defines << 'GCC_GENERATE_DEBUGGING_SYMBOLS=NO MACH_O_TYPE=staticlib'
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-xcframework
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.6.1
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-12 00:00:00.000000000 Z
+date: 2023-07-13 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.14
+rubygems_version: 3.4.16
 signing_key:
 specification_version: 4
 summary: 把podspec打包成xcframework的小工具。packager pod to a xcframework