cocoapods-bb-xcframework 0.2.6.2 → 0.2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86de5787fc0f9a46661f7ebfd6c0cc0ef65f22a879cd1dc7c2925d130a58e2a9
-  data.tar.gz: 2b0acbb4860569d5b3db5367ac3a4262a707d0197db2d395dc1b7e34beb89d5d
+  metadata.gz: 7b4c60e8964374bb98b58a5aa9ebf315d18cf752cbbf35eebab71ae9bfb68d45
+  data.tar.gz: '028f3e39db67dcf294124e76eb6800ba634af4c02dc129a73b36daf65cf380d7'
 SHA512:
-  metadata.gz: 5317a8a583129ad146fffacd4b8b105a36967ade03d19a565b1029a17c1692b4964b7e09ec1830ef35424ee9f5e8691d7fc0eaba63372c6de6b0407df84ac915
-  data.tar.gz: 020f0ccc7d37338714eef9e7d09cdf33bfe0ac5997711b792cc6fe9ff4c9aa85ea1f09916d4721b99281074a810ec0e6a68daee0320cd70b579eb6c0ce12794c
+  metadata.gz: 8810dbb80183b22c09ef068f4dbad5a00e83910bc6b6767ecd321ad76b1eb721f582322f1f25343d7d391fc1eacf75faf116622db159245cc3180a0e33b8e3ec
+  data.tar.gz: 6ee47de50f032f31fe3e57a416042df6da2b48220e2bf42e082c952153ef91bfae5cc93fb24fb71d6de6ecc836a626cc19f2f924bfe333fed6f23efacc67d874

data/lib/cocoapods-xcframework/frameworker.rb

@@ -19,7 +19,7 @@ module Pod
 
     def run
       spec = spec_with_path @name
-      UI.warn "正在生成XCFramework #{spec.name}(#{spec.version})"
+      UI.puts "正在生成XCFramework #{spec.name}(#{spec.version})".yellow
       @is_spec_from_path = true if spec
       spec ||= spec_with_name @name
 

data/lib/cocoapods-xcframework/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsXCFramework
-  VERSION = "0.2.6.2"
+  VERSION = "0.2.6.4"
 end

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

@@ -91,7 +91,18 @@ module Pod
                 other_flags << "-framework #{item} "
               end
             else
-              UI.puts "configuration:#{configuration} val:#{val}"
+              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
@@ -290,6 +301,29 @@ module Pod
           end
         end
       end
+      puts "fix_header_file".yellow
+      puts spec_hash.to_json
+      spec_hash
+    end
+
+    # 脚本不会针对podspec中配置resources、resource_bundles动态生成bundle，故手动进行bundle路径修复
+    def fix_bundle_file(origin_spec, spec_hash, project_dir, xcframework_path)
+      puts "fix_bundle_file".yellow
+      origin_spec_hash = origin_spec.to_hash
+      res_bundle=origin_spec_hash["resource_bundles"]
+      if res_bundle
+        puts "二进制库不支持动态生成bundle文件，请手动存放bundle文件 参照：s.resources = 'xx.bundle' ".red
+        raise "#{res_bundle}"
+      end
+      res_bundle=origin_spec_hash["resources"]
+      if res_bundle
+        puts "s.resources:#{res_bundle}"
+        bundle_path="#{project_dir}/#{res_bundle}"
+        FileUtils.cp_r(bundle_path,xcframework_path)
+        xcframework_comp = File.basename(xcframework_path)
+        bundle_comp = File.basename(res_bundle)
+        spec_hash["resources"] = "#{xcframework_comp}/#{bundle_comp}" # bundle资源存放规则，xcframework根目录
+      end
       puts spec_hash.to_json
       spec_hash
     end

data/lib/cocoapods-xcframework/xbuilder.rb

@@ -183,7 +183,9 @@ module Pod
       outputs_bundle target_dir
       new_spec_hash = generic_new_podspec_hash @spec
       new_spec_hash[:vendored_frameworks] = "#{@spec.name}.xcframework"
-      new_spec_hash = fix_header_file new_spec_hash, "#{target_dir}/#{@spec.name}.xcframework"
+      xcframework_path = "#{target_dir}/#{@spec.name}.xcframework"
+      new_spec_hash = fix_header_file new_spec_hash, xcframework_path
+      new_spec_hash = fix_bundle_file(@spec, new_spec_hash, @source_dir, xcframework_path)
       find_bundles(target_dir).each do |plat, value| 
         if new_spec_hash[plat]
           new_spec_hash[plat]["resource_bundles"] = value
@@ -202,7 +204,7 @@ module Pod
       UI.puts "fix xcframework-is-not-a-member-type-of-error:#{target_dir}"
       fix_xcframework_error(target_dir, @spec.name)
 
-      UI.puts "result export at :#{target_dir}"
+      UI.puts "result export at :#{target_dir} 生成成功".green
       target_dir
     end
 

metadata

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