cocoapods-meitu-bin 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86aab10f2c27b3bfbdf44ed3b6874b7d6be473bb91dcd8a51c0e5906547d48e6
-  data.tar.gz: a3b0f074a9ee8c24c8043c558314ea3bdfc3b28d1513e87909717547819b8460
+  metadata.gz: 44b755bd80acc307a5c25f91cd7d07911fb0f81df3342739a3e099bdbc3eb6e0
+  data.tar.gz: fc5c280e229de927df2e429da8494146de709d16429ecc143e05447244ad34a8
 SHA512:
-  metadata.gz: '088de3a018fda2b6b9215b61a26e101881fd4ca2a5a1f2ec9c4a9a4773b4ac3d11c4cd880a4ee979fc776a76bb54fcada03ae198b7dc14096903ee8d43a78f1c'
-  data.tar.gz: 7bf240596cded061b4dc3f86006c4e47f4fa9d5613a37b9d2655943ad8c980930e639159737fcd5f4ec5d7564cb5deecf7918ccfacaaf03257bb8a72a1026763
+  metadata.gz: e23a6e77f03c087df977c2d23418e2b5a3da59eca718923dfe9653136dd9ef8252c4596b59ddc1c1c3160b19e810b980f049ffd3303183eb5ce25d61ceea89cf
+  data.tar.gz: 20441e3f37762cb9c2039fc1a0bffbbfe1f899d2ec64693570008f4489b27c4f8e17a402dfe7cc01fe3b05a085f51e8aa241219d23ba47772659465b2d32d334

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

@@ -165,8 +165,15 @@ class PodUpdateConfig
   @@is_clear = false
   @@shell_project = false
   @@external_source_commit = {}
+  @@binary_version_pods = []
 
+  def self.set_binary_version_pods(pods)
+    @@binary_version_pods = pods
+  end
 
+  def self.binary_version_pods
+    @@binary_version_pods
+  end
 
   def self.set_external_source_commit
     podfile_obj = Pod::Config.instance.podfile

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

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end
 
 module Pod

data/lib/cocoapods-meitu-bin/helpers/buildAll/bin_helper.rb

@@ -25,11 +25,13 @@ module CBin
               specs << dependencies_commit_str(pod_name, specifications)
             end
           end
+          specs << binary_version_pods_str(specifications)
           specs <<  minimum_deployment_target_str
           specs <<  bundle_identifier_str
           specs <<  random_value_str
           specs << xcode_version
           specs << (configuration.nil? ? 'Debug' : configuration)
+        
           specs_str = specs.join('')
           if ENV['p_bin_v'] == '1'
             UI.puts "`#{pod_name}`：#{specs_str}".red
@@ -42,6 +44,85 @@ module CBin
         "#{original_version}.bin#{specs_str_md5}"
       end
 
+      # 获取参与二进制版本号生成的组件的tag/commit信息
+      def binary_version_pods_str(specifications)
+        binary_version_pods = PodUpdateConfig.binary_version_pods
+        return '' if binary_version_pods.empty?
+
+        # 获取所有直接和间接依赖
+        all_dependencies = get_all_dependencies(binary_version_pods, specifications)
+        
+        result = []
+        all_dependencies.each do |pod_name|
+          # 优先使用 external_source_commit
+          if PodUpdateConfig.external_source_commit[pod_name]
+            result << "#{pod_name}(#{PodUpdateConfig.external_source_commit[pod_name]})"
+            next
+          end
+
+          # 如果没有 external_source_commit，则使用版本号
+          specifications.each do |spec|
+            if spec.root.name == pod_name
+              version = spec.root.version.to_s
+              # 如果是二进制版本，去掉二进制版本号后缀
+              version_arr = version.split('.')
+              if version_arr.last.include?('bin')
+                version_arr.delete_at(version_arr.size - 1)
+                version = version_arr.join('.')
+              end
+              result << "#{pod_name}(#{version})"
+              break
+            end
+          end
+        end
+        
+        if ENV['p_bin_v'] == '1'
+          UI.puts "参与二进制版本号生成的组件：#{result.join(',')}".yellow
+        end
+        
+        result.join(',')
+      end
+
+      # 递归获取所有依赖（包括直接依赖和间接依赖）
+      def get_all_dependencies(pod_names, specifications)
+        result = Set.new(pod_names)
+        visited = Set.new
+
+        pod_names.each do |pod_name|
+          get_dependencies_recursively(pod_name, specifications, result, visited)
+        end
+
+        # 打印所有PopRock相关的间接依赖
+        if ENV['p_bin_d'] == '1'
+          poprock_deps = result.select { |name| name.include?('PopRock') }
+          if poprock_deps.any?
+            UI.puts "\nPopRock相关组件及其依赖：".yellow
+            poprock_deps.each do |dep|
+              UI.puts "- #{dep}"
+            end
+          end
+        end
+
+        result.to_a
+      end
+
+      # 递归获取单个组件的所有依赖
+      def get_dependencies_recursively(pod_name, specifications, result, visited)
+        return if visited.include?(pod_name)
+        visited.add(pod_name)
+
+        specifications.each do |spec|
+          if spec.root.name == pod_name
+            spec.dependencies.each do |dep|
+              next if dep.root_name == pod_name # 跳过自依赖
+              result.add(dep.root_name)
+              get_dependencies_recursively(dep.root_name, specifications, result, visited)
+            end
+            break
+          end
+        end
+      end
+
       #最低部署目标，参与二进制版本生成
       def minimum_deployment_target_str
         CBin.config.minimum_deployment_target

data/lib/cocoapods-meitu-bin/native/podfile.rb

@@ -1,11 +1,10 @@
-
-
 require 'cocoapods'
 require 'cocoapods-meitu-bin/native/podfile_env'
 
 module Pod
   class Podfile
     # TREAT_DEVELOPMENTS_AS_NORMAL = 'treat_developments_as_normal'.freeze
+    BINARY_VERSION_PODS = 'binary_version_pods'.freeze
 
     module DSL
       def allow_prerelease!
@@ -43,6 +42,13 @@ module Pod
       def set_configuration_env(env = "dev")
         set_internal_hash_value(CONFIGURATION_ENV, env)
       end
+
+      # 设置参与二进制库版本号生成的组件名称
+      def set_binary_version_pods(pods)
+        hash_binary_version_pods = get_internal_hash_value(BINARY_VERSION_PODS) || []
+        hash_binary_version_pods += Array(pods)
+        set_internal_hash_value(BINARY_VERSION_PODS, hash_binary_version_pods)
+      end
     end
 
     alias old_plugins plugins
@@ -85,6 +91,11 @@ module Pod
       get_internal_hash_value(CONFIGURATION, "Debug")
     end
 
+    # 获取参与二进制库版本号生成的组件名称列表
+    def binary_version_pods
+      get_internal_hash_value(BINARY_VERSION_PODS, []) + String(ENV[BINARY_VERSION_PODS]).split('|').uniq
+    end
+
     private
 
     def valid_bin_plugin

data/lib/cocoapods-meitu-bin/native/resolver.rb

@@ -1,5 +1,3 @@
-
-
 require 'parallel'
 require 'cocoapods'
 require 'cocoapods-meitu-bin/native/podfile'
@@ -146,6 +144,7 @@ module Pod
 
         sources_manager = Config.instance.sources_manager
         use_source_pods = podfile.use_source_pods
+        PodUpdateConfig.set_binary_version_pods(podfile.binary_version_pods)
 
         # 从BinConfig读取black_list
         black_list = read_black_list

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-meitu-bin
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-17 00:00:00.000000000 Z
+date: 2025-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel