cocoapods-bb-bin 0.2.7.5 → 0.2.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5ec32213acb36e10ab5e168d45e9dc541cfcc445da98d4bb76572f6b93ddb66
-  data.tar.gz: b7d724ae801e154fe37accfe063d31f4032cfd3ddcf8042b1be9675d0df38415
+  metadata.gz: 217315f984f26fe6b5bb54b5ff7ea34540a5491538dad31354f0a8fe45fc4461
+  data.tar.gz: cfc58c78844c655c12f1c960e6214b289c4a1de18720c3e068c378362efc9b4d
 SHA512:
-  metadata.gz: a80372673884427b1ba0bf191bff64e36e7a5c53f87fb4177e56b2adb396b24bfa0eeebe2ce11dfa618faa5bd8ac7fc9f99ec74dec2592528b00341391f5fa20
-  data.tar.gz: b0b2dcbb8437e26f3eacffe64cce27d3a0158938229d318437008d76cc1f87232ec981b6eefbc47a0929bfcbdc524e86b4823e727977a928a327c1c4c7a362d7
+  metadata.gz: 4f480f0c44b4fbea3bfecd457e457f121ffb4f00b5be885151b012e2bf29d979da17558c865bc73241a839a6b6dc5cc67de5cd2d3246800fc089d94f3a36f1f2
+  data.tar.gz: 00c443843972dcffcc043578586f3fb462bf7acac5a2d8b6946109ae83dede1c4df7d214c930b909d354c5cc92a98fd855f8582970392285d83512eef9900cae

data/lib/cocoapods-bb-bin/gem_version.rb

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.2.7.5'
+  VERSION = '0.2.7.7'
 end
 
 module Pod

data/lib/cocoapods-bb-bin/helpers/spec_source_creator.rb

@@ -19,14 +19,14 @@ module CBin
         raise Pod::Informative, '源码 podspec 不能为空 .' unless code_spec
       end
 
-      def create(frameworkName=nil)
+      def create(frameworkName=nil, is_xcframework=false)
         # spec = nil
         if CBin::Build::Utils.is_framework(@code_spec)
-          Pod::UI::puts "make framework spec. vendored_framework_name:#{frameworkName}"
+          Pod::UI::puts "make framework spec. vendored_framework_name:#{frameworkName} is_xcframework:#{is_xcframework}"
           if !frameworkName # 如果外部没有传入fk名称默认组件名称
             frameworkName = code_spec.root.name
           end
-          spec = create_framework_from_code_spec(frameworkName)
+          spec = create_framework_from_code_spec(frameworkName, is_xcframework)
         else
           Pod::UI::puts "make source code spec. vendored_framework_name:#{frameworkName}"
           spec = create_from_code_spec
@@ -140,7 +140,7 @@ module CBin
         @spec
       end
 
-      def create_framework_from_code_spec(frameworkName)
+      def create_framework_from_code_spec(frameworkName, is_xcframework)
         @spec = code_spec.dup
         # vendored_frameworks | resources | source | source_files | public_header_files
         # license | resource_bundles | vendored_libraries
@@ -148,14 +148,16 @@ module CBin
         # Project Linkin
         @spec.vendored_frameworks = "#{frameworkName}.{framework,xcframework}" # 支持framework、xcframework
         
-        # Resources
+        # Resources # framework以业务方自己配置为主 by hm 23/10/18
         extnames = []
         extnames << '*.bundle' if code_spec_consumer.resource_bundles.any?
         if code_spec_consumer.resources.any?
-          extnames += code_spec_consumer.resources.map { |r| File.basename(r) }
+          # extnames += code_spec_consumer.resources.map { |r| File.basename(r) }
+          extnames = code_spec_consumer.resources
         end
         if extnames.any?
-          @spec.resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } }
+          @spec.resources = extnames
+          # @spec.resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } }
         end
 
         # Source Location

data/lib/cocoapods-bb-bin/helpers/upload_helper.rb

@@ -33,10 +33,13 @@ module CBin
           # 创建binary-template.podsepc
           # 上传二进制文件
           # 上传二进制 podspec
+          puts "开始准备上传二进制文件 zip:#{zip_file}".yellow
           isupload = binary_upload(zip_file)
+          puts "上传二进制文件完成 状态:#{isupload}".green
           if isupload
-            filename = spec_creator(vendored_framework_name)
-            Pod::UI.puts "上传二进制 podspec: #{filename} 是否动态库: #{isGenDylib} vendored_framework_name:#{vendored_framework_name}"
+            is_xcframework = zip_file.include?('xcframework.zip')
+            filename = spec_creator(vendored_framework_name, is_xcframework)
+            Pod::UI.puts "上传二进制 podspec: #{filename} zip:#{zip_file} 是否动态库: #{isGenDylib} vendored_framework_name:#{vendored_framework_name} is_xcframework:#{is_xcframework}"
             push_helper = CBin::Push::Helper.new()
             push_helper.push_binary_repo(filename,isGenDylib)
             # 上传源码 podspec
@@ -50,10 +53,10 @@ module CBin
       end
 
       private
-      def spec_creator(vendored_framework_name=nil)
+      def spec_creator(vendored_framework_name=nil, is_xcframework=false)
         spec_creator = CBin::SpecificationSource::Creator.new(@spec)
         @spec_creator = spec_creator
-        spec_creator.create(vendored_framework_name)
+        spec_creator.create(vendored_framework_name, is_xcframework)
         spec_creator.write_spec_file
         spec_creator.filename
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.2.7.5
+  version: 0.2.7.7
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: cocoapods-bb-bin is a plugin which helps develpers switching pods between