cocoapods-bb-bin 0.2.7.11 → 0.2.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e334d566dee758f5c2592d2ffc72b863255d1f08759cf59650b4abe59b6e8d2
-  data.tar.gz: adddf8822527acd261a9e967e261b3008a996086a507199548d61bbfaf690ea8
+  metadata.gz: 3a5579a95a680e9df16bde7f2602a630984a3140ae78db756cc018518bcb93f6
+  data.tar.gz: 9e1711ec6d8dbbcc0e105ca7ac8babb32fc46993cb4659617abfdd585fe1f30b
 SHA512:
-  metadata.gz: 9e59446bca139135c8ad404215322afdf29fae1ee434cd7aabfaa85393271a995ed832bedb23fb8b27446c037a463acb0c6e6365219821d3bdf82f145d213117
-  data.tar.gz: 445592c43862620d945773a09fd440c4a13fcc54febcccbffb792a58ab01cfc6454caedc9516985caa16a48f7938ffd9185eb1979b257cc9ff3dec679f8afd30
+  metadata.gz: 8cf54cd4704524ac4221288883e1af90e57b17265d00bd39e16027627b9b99d6021512765bfacf4f398f0f9f9fe1f6f5976c2fa3c15302a585ef1552db60a148
+  data.tar.gz: 2626c509a16fdc95d04585b4babce6b325fc67854aa01e7df84c4998a6df6c10a495b8f4406e0046fce9d90230a8f2e26512507f87ee35566115fa9186981c42

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

@@ -2,6 +2,7 @@ require 'yaml'
 require 'cocoapods-bb-bin/native/podfile'
 require 'cocoapods-bb-bin/native/podfile_env'
 require 'cocoapods/generate'
+require 'ostruct'
 
 module CBin
   class Config

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

@@ -1,7 +1,7 @@
 require 'cocoapods'
 
 module CBin
-  VERSION = '0.2.7.11'
+  VERSION = '0.2.7.13'
 end
 
 module Pod

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

@@ -50,8 +50,8 @@ module CBin
         end
 
         @filename = file
-        # Pod::UI::puts "===copy origin file: #{file}"
-        # Pod::UI::puts "===copy desc file: #{sourceSpecFilePath}"
+        # Pod::UI::puts "===copy origin file: #{file}".red
+        # Pod::UI::puts "===copy desc file: #{sourceSpecFilePath}".red
         # 拷贝二进制spec到源码spec by hm 22/1/19
         `cp -fa #{file} #{sourceSpecFilePath}` 
       end
@@ -149,15 +149,27 @@ module CBin
         # vendored_frameworks | resources | source | source_files | public_header_files
         # license | resource_bundles | vendored_libraries
 
+        fkname = "#{frameworkName}.{framework,xcframework}" # 支持framework、xcframework
         # Project Linkin
-        @spec.vendored_frameworks = "#{frameworkName}.{framework,xcframework}" # 支持framework、xcframework
+        @spec.vendored_frameworks = "#{fkname}"
         
         # 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
+          puts "create_framework_from_code_spec extnames:#{extnames}".red
+          puts "code_spec_consumer:#{code_spec_consumer}".red
+          puts "is_xcframework:#{is_xcframework}".red
+          # 自有库bundle需要修改路径，二进制生成在xx.xcframework/xx.bundle by hm 24/2/28
+          if is_xcframework == true 
+            code_spec_consumer.resources.map { |r| 
+              bundle_comp = File.basename(r) 
+              extnames << "#{fkname}/#{bundle_comp}"
+            }
+          else 
+            extnames = code_spec_consumer.resources
+          end
         end
         if extnames.any?
           @spec.resources = extnames

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

@@ -37,7 +37,17 @@ module CBin
           isupload = binary_upload(zip_file)
           puts "上传二进制文件完成 状态:#{isupload}".green
           if isupload
-            is_xcframework = zip_file.include?('xcframework.zip')
+            is_xcframework = false
+            [
+              "xcframework.zip", # 三方库
+              "xcframework_#{@spec.version}.zip", # 自有库
+            ].each do |name|
+              is_xcframework = zip_file.include?(name)
+              if is_xcframework == true
+                break
+              end
+            end
+            # 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()

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

@@ -61,6 +61,14 @@ module CBin
                 target_dir = File.join(framework_folder_path,framework_name)
                 return target_dir
             end
+            def podspec_name
+                file_name = "#{@spec.name}.podspec.json"
+                return file_name
+            end
+            def podspec_file_path
+                target_dir = File.join(framework_folder_path,podspec_name)
+                return target_dir
+            end
 
             def cp_to_source_dir
 
@@ -75,7 +83,14 @@ module CBin
                 # FileUtils.mkdir_p(zip_dir) unless File.exist?(zip_dir)
 
                 UI.puts "Compressing #{framework_file_path} into #{target_dir}"
+                
+                # `cp -fa #{framework_file_path} #{target_dir}` # xcframework文件拷贝
                 `cp -fa #{framework_file_path} #{target_dir} && rm -rf #{framework_folder_path}` # xcframework文件拷贝 & 删除源文件
+
+                # 是否可以考虑以xcframework配置为主？？？
+                # spec_dir = CBin::Config::Builder.instance.local_psec_dir
+                # puts "spec_dir:#{spec_dir}".red
+                # `cp -fa #{podspec_file_path} #{spec_dir} && ls -al #{spec_dir}`
             end
         end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.2.7.11
+  version: 0.2.7.13
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-05 00:00:00.000000000 Z
+date: 2024-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -44,6 +44,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.2
 - !ruby/object:Gem::Dependency
   name: cocoapods-generate
   requirement: !ruby/object:Gem::Requirement
@@ -70,7 +84,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6.3
+        version: 0.2.6.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -80,7 +94,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6.3
+        version: 0.2.6.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -206,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: cocoapods-bb-bin is a plugin which helps develpers switching pods between