cocoapods-xcframework 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5f82bd06f313889e45d18abb7d66ff2ee78516575754c09a41edc700d52aba1
-  data.tar.gz: 8828713c3735d4af8ad194e96e80cab0e9705b527921cf542b536a1248cc9ba7
+  metadata.gz: 7be443184d16587d0967f9f2ea2854504e63f809cac1a3ecd42da7b7bfc093ee
+  data.tar.gz: f9c4ecc06ba587319ba049b413ac4a3176a09143ba9a29fc207bda7f44e297d6
 SHA512:
-  metadata.gz: 94f8739a2e0ef78df20f5475e860b400909295dff8393ecbe12dfded326d9c38016dd50cb2c665c26afb0de8e297bbec7f9c3d74782409358d36d6c2fb8362bc
-  data.tar.gz: 3324b859a452d8461f89666b9da4529e942cd30de79352fb09eb5b26de6335518236b4eadb7e8f072f079814b7b2eca0071e031df1dc1824b962a4333064e7fe
+  metadata.gz: 5298eca4684e586bcfd5670ac6f0831c6b8cc9a25fb209ae3b19a6ade8ac6f1faba0c20da54ab014495693183417e1d4257aec2fa0616daa76c6d6a591070889
+  data.tar.gz: 1e294d7ec2524dd4a0d1fd8b2e4adab72733c0953dc64ee74b4fde35cf06a257bbfa1ca86f618d14c3171a0b33387965c70adce01fdde301994b26c80819fff3

data/lib/cocoapods-framework/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsFramework
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

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

@@ -48,8 +48,10 @@ module Pod
 
       unless installer.nil? 
         installer.pods_project.targets.each do |target|
-          target.build_configurations.each do |configuration|
-            configuration.build_settings['CLANG_MODULES_AUTOLINK'] = 'NO'
+          if target.name == spec.name
+            target.build_configurations.each do |configuration|
+              configuration.build_settings['CLANG_MODULES_AUTOLINK'] = 'NO'
+            end
           end
         end
         installer.pods_project.save

data/lib/cocoapods-framework/xbuilder.rb

@@ -43,8 +43,11 @@ module Pod
 
     def collect_bundles
       ["iphoneos","macOS","appletvos","watchos"].each do |plat|
-        export_dir = "#{@sandbox_root}/export/*-#{plat}/**/#{@spec.name}.bundle"
+        export_dir = "#{@sandbox_root}/export/*-#{plat}/**/#{@spec.name}.bundle/**"
         Pathname.glob(export_dir).each do |bundle|
+          if bundle.to_s.include? "#{@spec.name}.bundle/Info.plist"
+            return
+          end
           @outputs[:bundle] = "#{@sandbox_root}/bundle"
           native_platform = to_native_platform plat
           path = Pathname.new "#{@sandbox_root}/bundle/#{native_platform}"
@@ -103,7 +106,15 @@ 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[:resource_bundles] = find_bundles target_dir
+      find_bundles(target_dir).each do |plat, value| 
+        if new_spec_hash[plat]
+          new_spec_hash[plat]["resource_bundles"] = value
+        else
+          new_spec_hash[plat] = {
+            "resource_bundles" => value
+          }
+        end
+      end
       require 'json'
       spec_json = JSON.pretty_generate(new_spec_hash) << "\n"
       File.open("#{target_dir}/#{@spec.name}.podspec.json",'wb+') do |f|
@@ -115,13 +126,14 @@ module Pod
     
     def find_bundles target_dir
       bundle_root = "#{target_dir}/bundle/"
-      bundle_name = "/#{@spec.name}.bundle"
-      pattern = "#{bundle_root}*#{bundle_name}"
+      pattern = "#{bundle_root}*"
       result = {}
       Pathname.glob(pattern).each do |bundle|
         bundle_relative_path = bundle.to_s.gsub(bundle_root, "")
-        plat = bundle_relative_path.gsub(bundle_name,"")
-        result[plat] = "bundle/" + bundle_relative_path
+        plat = bundle_relative_path
+        result[plat] = {
+          "NMCAlbumKit" => "bundle/" + bundle_relative_path + "/*"
+        }
       end
       result
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-xcframework
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - 戴易超
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -90,6 +90,7 @@ files:
 - pkg/cocoapods-framework-0.0.3.gem
 - pkg/cocoapods-xcframework-0.0.4.gem
 - pkg/cocoapods-xcframework-0.0.6.gem
+- pkg/cocoapods-xcframework-0.0.7.gem
 - spec/command/framework_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/TyrantDante/cocoapods-framework