cocoapods-bb-bin 0.2.7.4 → 0.2.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80c0429394d3ce85918c28ebcfa8f817aade2bb2309a73a980e447d6af6f48e8
-  data.tar.gz: d4c3794d17b0950d9279e460fedc9eb628adf299cfcc5851e95311e8bdefdba8
+  metadata.gz: 5a9b0a9641bce498a348c46659591f9ddbd7c7a1157450962337f7888d8f118b
+  data.tar.gz: f7ae31e33e1185d269b94d5285d6688dde56a39e6de86d0089110ddd37317e49
 SHA512:
-  metadata.gz: 0a78ad44d84637689c249ad3a210ce467c0f2c0c95b9159710f6d621c902d13ef8077b751a124d1d7682083bd8ce019c1c3613b06192285d2d291c004922de5c
-  data.tar.gz: c0f9294119b2f5662422c95e7a6073e1c39a010e5a3e41703c0b6050fb6d47420e290cb3f2a25575095c25c5e53f2181b8b41ce5311dec5be647c06dcaa9b8ba
+  metadata.gz: e21a5506c5878581e8211c87aa1decdd72471da7aa53ec48dd8b1674e2994befe076b6a3c6524a14305f6a872087ccbb8c9afbcaf422273425d3fda2d3a2f9ec
+  data.tar.gz: d1502a03cfec8af2529be66cb3d7bb57af0f40b6f93f753a27af9c14bcabda98062e636bf39fb0b94cb70b1db4814f56428487899dcf047ed0a9a2e0dd738113

data/lib/cocoapods-bb-bin/command/bin/auto.rb

@@ -211,7 +211,7 @@ module Pod
           Pathname.pwd.children.each do |child|
             # puts child
             if File.file?(child)
-              if child.extname == '.podspec'
+              if child.extname == '.podspec' || child.basename.to_s.include?('.podspec.json')
                 name = File.basename(child)
                 unless name.include?("binary-template")
                   return name

data/lib/cocoapods-bb-bin/command/bin/localPush.rb

@@ -99,7 +99,7 @@ module Pod
             Pathname.pwd.children.each do |child|
               # puts child
               if File.file?(child)
-                if child.extname == '.podspec'
+                if child.extname == '.podspec' || child.basename.to_s.include?('.podspec.json')
                   name = File.basename(child)
                   unless name.include?("binary-template")
                     return name

data/lib/cocoapods-bb-bin/command/bin/tag.rb

@@ -72,7 +72,7 @@ module Pod
             Pathname.pwd.children.each do |child|
               # puts child
               if File.file?(child)
-                if child.extname == '.podspec'
+                if child.extname == '.podspec' || child.basename.to_s.include?('.podspec.json')
                   name = File.basename(child)
                   unless name.include?("binary-template")
                     return name

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.2.7.4'
+  VERSION = '0.2.7.6'
 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
@@ -155,7 +155,11 @@ module CBin
           extnames += code_spec_consumer.resources.map { |r| File.basename(r) }
         end
         if extnames.any?
-          @spec.resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } }
+          if is_xcframework
+            @spec.resources = extnames # xcframework以业务方自己配置为主 by hm 23/10/18
+          else
+            @spec.resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } }
+          end
         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.4
+  version: 0.2.7.6
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-14 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