cocoapods-meitu-bin 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86aab10f2c27b3bfbdf44ed3b6874b7d6be473bb91dcd8a51c0e5906547d48e6
-  data.tar.gz: a3b0f074a9ee8c24c8043c558314ea3bdfc3b28d1513e87909717547819b8460
+  metadata.gz: 7031e306ba5fe02226aa2ef9d1e35d27c6de7683c3ff0010c430bec87778bdd8
+  data.tar.gz: 571e8af4cdeb6b04f669ee6fcc3111a44a626df6e8f5d6887e7afbebfbca443d
 SHA512:
-  metadata.gz: '088de3a018fda2b6b9215b61a26e101881fd4ca2a5a1f2ec9c4a9a4773b4ac3d11c4cd880a4ee979fc776a76bb54fcada03ae198b7dc14096903ee8d43a78f1c'
-  data.tar.gz: 7bf240596cded061b4dc3f86006c4e47f4fa9d5613a37b9d2655943ad8c980930e639159737fcd5f4ec5d7564cb5deecf7918ccfacaaf03257bb8a72a1026763
+  metadata.gz: 0675d5f0d9aa51c0fdd09a567da454c1644f035b5f40867910b5984834aecb807b27586e73b991a05c1e0222c3f49ef195c0deb1cae82a4e729d45f49d84b79a
+  data.tar.gz: 6607870a45cb753f7a86426f0637d0f30b5a2fc38912c8a0a5fab00af1bea2e0dec17d4f1b42a494c61bc3f4a317be83a44dae098ed7032934a7574fdc9c8c0b

data/lib/cocoapods-meitu-bin/command/bin/build_all.rb

@@ -47,7 +47,7 @@ module Pod
           @full_build = argv.flag?('full-build', false)
           @skip_simulator = argv.flag?('skip-simulator', false)
           @configuration = argv.option('configuration', 'Debug')
-          @base_dir = "#{Pathname.pwd}/build_pods"
+          @base_dir = ENV['POD_BUILD_BASE_DIR'] || "#{Pathname.pwd}/all_build/Build"
           @version_helper = BinHelper.new
           super
         end
@@ -106,8 +106,10 @@ module Pod
         def read_config
           UI.title 'Read config from file `BinConfig.yaml`'.green do
             config_file = File.join(Pod::Config.instance.project_root, 'BinConfig.yaml')
+            UI.info "BinConfig：`#{config_file}`".yellow
             return unless File.exist?(config_file)
             config = YAML.safe_load(File.open(config_file))
+            UI.info "BinConfig：`#{config}`".yellow
             return if config.nil?
             build_config = config['build_config']
             return if build_config.nil?
@@ -115,6 +117,7 @@ module Pod
             @post_build = build_config['post_build']
             @black_list = build_config['black_list']
             @write_list = build_config['write_list']
+            UI.info "BinConfig：`#{@write_list}`".yellow
           end
         end
 
@@ -212,7 +215,9 @@ module Pod
                 # 黑名单（不分全量和非全量）
                 next if skip_build?(pod_target)
                 # 白名单（有白名单，只看白名单，不分全量和非全量）
-                next if !@write_list.nil? && !@write_list.empty? && !@write_list.include?(pod_target.pod_name)
+                UI.info "USE_WHITELIST：`#{ ENV['USE_WHITELIST']}`".yellow
+                UI.info "include?：`#{@write_list.include?(pod_target.pod_name)}`".yellow
+                next if ENV['USE_WHITELIST'] && !@write_list.nil? && !@write_list.empty? && !@write_list.include?(pod_target.pod_name)
                 # 本地库
                 if @sandbox.local?(pod_target.pod_name)
                   local_pods << pod_target.pod_name
@@ -301,7 +306,7 @@ module Pod
                 # 黑名单（不分全量和非全量）
                 next if skip_build?(pod_target)
                 # 白名单（有白名单，只看白名单，不分全量和非全量）
-                next if !@write_list.nil? && !@write_list.empty? && !@write_list.include?(pod_target.pod_name)
+                next if ENV['USE_WHITELIST'] && !@write_list.nil? && !@write_list.empty? && !@write_list.include?(pod_target.pod_name)
                 # 本地库
                 if @sandbox.local?(pod_target.pod_name)
                   local_pods << pod_target.pod_name
@@ -309,7 +314,12 @@ module Pod
                   next
                 end
                 # 外部源（如 git）
-                if @sandbox.checkout_sources[pod_target.pod_name]
+                excluded_names = PodUpdateConfig.external_source_binary
+                                                .map { |s| s[:name] }
+                                                .compact # 过滤nil值
+                                                .uniq   # 去重
+
+                if @sandbox.checkout_sources[pod_target.pod_name] && !excluded_names.include?(pod_target.pod_name) && !pod_target.should_build?
                   external_pods << pod_target.pod_name
                   show_skip_tip("#{pod_target.pod_name} 以external方式引入")
                   next

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

@@ -164,34 +164,144 @@ class PodUpdateConfig
   @@is_mtxx = false
   @@is_clear = false
   @@shell_project = false
+  @@checkout_options = {}
+  @@dependency_relationships = {}  # 存储所有组件的依赖关系集合，格式: { pod_name => { dependencies: { dep_name => { version: version, requirement: requirement } } } }
+
+  # 用于存储外部源的commit信息
   @@external_source_commit = {}
+  # 用于存储需要过滤的外部源信息
+  @@external_source = []
+  # 用于存储需要记录制作的external_source 组件
+  @@external_source_binary = []
+
+  # 设置依赖关系集合
+  def self.set_dependency_relationships(relationships)
+    @@dependency_relationships = relationships
+  end
+
+  # 获取依赖关系集合
+  def self.dependency_relationships
+    @@dependency_relationships
+  end
+
+  def self.set_result(result)
+    @@result = result
+  end
+
+  def self.result
+    @@result
+  end
+
+  def self.set_external_source(dic)
+    @@external_source << dic
+  end
+  def self.external_source()
+    @@external_source
+  end
+
+
+  def self.set_external_source_binary(dic)
+    @@external_source_binary << dic
+  end
+  def self.external_source_binary()
+    @@external_source_binary
+  end
+
+  def self.set_checkout_options(options)
+    @@checkout_options = options
+  end
+
+  def self.checkout_options
+    @@checkout_options
+  end
 
+  def self.get_checkout_option(pod_name,podfile)
+    options = @@checkout_options[pod_name]
 
+    # return nil unless !podfile.use_source_pods.include?(pod_name)
+    return nil unless options
 
-  def self.set_external_source_commit
-    podfile_obj = Pod::Config.instance.podfile
-    # 遍历 Podfile 中的目标定义
-    podfile_obj.target_definitions.each do |target_name, target_definition|
-      target_definition.dependencies.each do |dependency|
-        if dependency.external_source
-          # if dependency.name == "MTBusinessBaseKit"
-          #   puts dependency.external_source
-          # end
-          if dependency.external_source[:commit]
-            git_commit = dependency.external_source[:commit]
-            # puts "Git Commit for #{dependency}: #{git_commit}"
-            if @@external_source_commit[dependency.name].nil?
-              @@external_source_commit[dependency.name] = git_commit
-            end
+    # 优先返回commit信息
+    if options[:commit]
+      options[:commit]
+    # 其次返回tag信息
+    elsif options[:tag]
+      options[:tag]
+    else
+      nil
+    end
+  end
+
+  def self.parse_checkout_options(lockfile_path)
+    return unless File.exist?(lockfile_path)
+    
+    begin
+      content = File.read(lockfile_path)
+      checkout_section = content.split('CHECKOUT OPTIONS:').last.split('SPEC REPOS:').first.strip
+      
+      options = {}
+      current_pod = nil
+      
+      checkout_section.each_line do |line|
+        line = line.strip
+        next if line.empty?
+        
+        if line.start_with?('  ')
+          # 这是pod的选项
+          if current_pod
+            key, value = line.strip.split(': ', 2)
+            options[current_pod] ||= {}
+            options[current_pod][key] = value
+          end
+        else
+          # 这是pod名称
+          current_pod = line.strip
+        end
+      end
+      
+      set_checkout_options(options)
+      
+      if ENV['p_bin_d'] == '1'
+        puts "\nPodfile.lock CHECKOUT OPTIONS:".yellow
+        options.each do |pod, opts|
+          puts "#{pod}:"
+          opts.each do |key, value|
+            puts "  #{key}: #{value}"
           end
         end
       end
+    rescue => e
+      warn "Failed to parse CHECKOUT OPTIONS from Podfile.lock: #{e.message}"
     end
-    puts "#{@@external_source_commit}" if ENV['p_bin_d'] == '1'
   end
-  def self.external_source_commit
-    @@external_source_commit
+
+  def self.parse_checkout_options_from_specs(checkout_options_hash,podfile)
+    options = {}
+    
+    checkout_options_hash.each do |pod_name, opts|
+      # 保存有 commit 或 tag 信息的组件
+      if (opts[:commit] || opts[:tag]) &&  !podfile.use_source_pods.include?(pod_name)
+        options[pod_name] = {
+          :git => opts[:git],
+          :commit => opts[:commit],
+          :tag => opts[:tag]
+        }.compact
+      end
+    end
+    
+    set_checkout_options(options)
+    
+    if ENV['p_bin_v'] == '1'
+      puts "\nResolver Specs CHECKOUT OPTIONS (commit/tag):".yellow
+      options.each do |pod, opts|
+        puts "#{pod}:"
+        opts.each do |key, value|
+          puts "  #{key}: #{value}"
+        end
+      end
+    end
   end
+
   def self.set_shell_project
     @@shell_project = true
   end
@@ -251,4 +361,4 @@ class PodUpdateConfig
   def self.is_clear
     @@is_clear
   end
-end
+end

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

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

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

@@ -17,19 +17,25 @@ module CBin
           specs = specifications.map(&:name).select { |spec|
             spec.include?(pod_name) && !spec.include?('/Binary')
           }.sort!
-          # puts "#{pod_name}:#{include_dependencies}"
-          if include_dependencies
-            specs << dependencies_str(pod_name, specifications)
+
+          version_name =  PodUpdateConfig.dependency_relationships[pod_name]
+          if  version_name
+            specs << version_name
           else
-            if !ENV['MEITU_USE_OPEN_COMMIT']
-              specs << dependencies_commit_str(pod_name, specifications)
-            end
+            specs << binary_version_pods_str(pod_name,specifications)
           end
+
           specs <<  minimum_deployment_target_str
           specs <<  bundle_identifier_str
           specs <<  random_value_str
-          specs << xcode_version
+          if  ENV['xcode_version']
+            specs <<  ENV['xcode_version']
+          else
+            specs << xcode_version
+          end
+
           specs << (configuration.nil? ? 'Debug' : configuration)
+
           specs_str = specs.join('')
           if ENV['p_bin_v'] == '1'
             UI.puts "`#{pod_name}`：#{specs_str}".red
@@ -42,6 +48,77 @@ module CBin
         "#{original_version}.bin#{specs_str_md5}"
       end
 
+
+      # 获取参与二进制版本号生成的组件的tag/commit信息
+      def binary_version_pods_str(pod_name,specifications)
+        # 获取所有直接和间接依赖
+        all_dependencies = get_all_dependencies(pod_name, specifications)
+        return '' if all_dependencies.nil? || all_dependencies.empty?
+        result = []
+        all_dependencies.each do |pod_name|
+          # 优先使用 get_checkout_option 中的 commit 或 tag
+          checkout_option = PodUpdateConfig.get_checkout_option(pod_name)
+          if checkout_option
+            result << "#{pod_name}(#{checkout_option})"
+            next
+          end
+
+          # 如果没有 commit 或 tag，则使用版本号
+          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_name, specifications)
+        result = Set.new([pod_name])  # 添加当前 pod 到结果集
+        visited = Set.new
+        get_dependencies_recursively(pod_name, specifications, result, visited)
+        
+        if ENV['p_bin_v'] == '1'
+          UI.puts "\n#{pod_name} 及其依赖：".yellow
+          result.each do |dep|
+            UI.puts "- #{dep}"
+          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
@@ -63,8 +140,8 @@ module CBin
       end
       
       def self.xcode_version
-          xcode_version = `xcodebuild -version`.split(' ').join('')
-          xcode_version
+        xcode_version = `xcodebuild -version`.split(' ').join('')
+        xcode_version
       end
 
       # 将当前 Pod 库的依赖库拼接成字符串（格式：pod1_name(pod1_version),pod2_name(pod2_version),...）
@@ -78,7 +155,7 @@ module CBin
         end
 
         if deps.empty?
-          UI.puts "`#{pod_name}`无依赖库".red if ENV['p_bin_d'] == '1'
+          UI.puts "`#{pod_name}`无依赖库".red if ENV['p_bin_v'] == '1'
           return ''
         end
         result = []
@@ -87,14 +164,16 @@ module CBin
             next
           end
           version = dep_version(dep, specifications)
-          if !ENV['MEITU_USE_OPEN_COMMIT']
-            if PodUpdateConfig.external_source_commit[dep.name]
-              version = PodUpdateConfig.external_source_commit[dep.name]
-            end
-          end
+          # if !ENV['MEITU_USE_OPEN_COMMIT']
+          #   if PodUpdateConfig.external_source_commit[dep.name]
+          #     version = PodUpdateConfig.external_source_commit[dep.name]
+          #   end
+          # end
+          commit = find_dependency_by_name(podfile, dep.name)
+          version = commit unless commit.nil?
           result << "#{dep.name}(#{version})"
         end
-        if ENV['p_bin_d'] == '1'
+        if ENV['p_bin_v'] == '1'
           if result.empty?
             UI.puts "`#{pod_name}`无依赖库".red
           else
@@ -113,7 +192,7 @@ module CBin
         end
 
         if deps.empty?
-          UI.puts "`#{pod_name}`无依赖库".red if ENV['p_bin_d'] == '1'
+          UI.puts "`#{pod_name}`无依赖库".red if ENV['p_bin_v'] == '1'
           return ''
         end
         result = []
@@ -121,9 +200,13 @@ module CBin
           if dep.root_name == pod_name
             next
           end
-          if PodUpdateConfig.external_source_commit[dep.name]
-            result << "#{dep.name}(#{PodUpdateConfig.external_source_commit[dep.name]})"
+          commit = find_dependency_by_name(podfile, dep.name)
+          if commit
+            result << "#{dep.name}(#{commit})"
           end
+          # if PodUpdateConfig.external_source_commit[dep.name]
+          #   result << "#{dep.name}(#{PodUpdateConfig.external_source_commit[dep.name]})"
+          # end
         end
         result.join(',')
       end

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

@@ -13,7 +13,7 @@ module CBin
         @file_accessors = pod_target.file_accessors unless pod_target.nil?
         @base_dir = "#{Pathname.pwd}/build_pods"
         if PodUpdateConfig.shell_project
-          @base_dir = "#{Pathname.pwd}/all_build/Build"
+          @base_dir =  ENV['POD_BUILD_BASE_DIR'] || "#{Pathname.pwd}/all_build/Build"
         end
       end
 
@@ -66,6 +66,9 @@ module CBin
       # 是否以framework形式构建
       def build_as_framework?
         path = "#{product_dir}/#{iphoneos}/#{@pod_target}/#{@pod_target.framework_name}"
+        if ENV['POD_BUILD_BASE_DIR']
+          path = "#{product_dir}/#{iphoneos}/#{@pod_target.framework_name}"
+        end
         File.exist?(path)
       end
 
@@ -96,7 +99,13 @@ module CBin
 
       # xxx.framework 所在目录
       def product_dir
-        @product_dir = "#{@base_dir}/Products"
+        path = ENV['POD_BUILD_BASE_DIR']
+        if path
+          @product_dir = path
+        else
+          @product_dir = "#{@base_dir}/Products"
+        end
+
         @product_dir
       end
 
@@ -106,7 +115,11 @@ module CBin
       end
 
       def iphoneos
-        "#{@configuration}-iphoneos"
+        iphoneos = "#{@configuration}-iphoneos"
+        if ENV['POD_BUILD_BASE_DIR']
+          iphoneos = "iphoneos"
+        end
+        iphoneos
       end
 
       def iphonesimulator
@@ -312,7 +325,14 @@ ibtool \
         return [] if @file_accessors.nil?
         resource_bundles = @file_accessors.flat_map(&:resource_bundles)
         return [] if resource_bundles.nil? || resource_bundles.size == 0
-        resource_bundles.compact.flat_map(&:keys).map { |key| "#{product_dir}/#{iphoneos}/#{@pod_target}/#{key}.bundle" }
+        resource_bundles.compact.flat_map(&:keys).map do |key|
+          if  ENV['POD_BUILD_BASE_DIR']
+            "#{product_dir}/#{iphoneos}/#{key}.bundle"
+          else
+            "#{product_dir}/#{iphoneos}/#{@pod_target}/#{key}.bundle"
+          end
+
+        end
       end
 
       # 获取podspec中resource/resources
@@ -374,6 +394,9 @@ ibtool \
       # 拷贝 framework
       def copy_framework
         source_path = "#{product_dir}/#{iphoneos}/#{@pod_target}/#{@pod_target.framework_name}"
+        if ENV['POD_BUILD_BASE_DIR']
+          source_path = "#{product_dir}/#{iphoneos}/#{@pod_target.framework_name}"
+        end
         if File.exist?(source_path)
           `rsync -av #{source_path} #{product_dir}`
         end

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

@@ -49,7 +49,7 @@ module CBin
       def write_binary_podspec(spec)
         UI.info "写入podspec：`#{@pod_target}`".yellow
         podspec_dir = PodUpdateConfig.shell_project ? "#{Pathname.pwd}/all_build/Build/Products/podspec" : "#{Pathname.pwd}/build_pods/#{@pod_target}/Products/podspec"
-        FileUtils.mkdir(podspec_dir) unless File.exist?(podspec_dir)
+        FileUtils.mkdir_p(podspec_dir) unless File.exist?(podspec_dir)
         file = "#{podspec_dir}/#{@pod_target.pod_name}.podspec.json"
         FileUtils.rm_rf(file) if File.exist?(file)
         File.open(file, "w+") do |f|
@@ -65,15 +65,29 @@ module CBin
         repo_name = Pod::Config.instance.sources_manager.binary_source.name
         # repo_name = 'example-private-spec-bin'
         argvs = %W[#{repo_name} #{binary_podsepc_json} --skip-import-validation --use-libraries --allow-warnings --verbose]
-        begin
-          push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
-          push.validate!
-          push.run
-          return true
-        rescue Pod::StandardError => e
-          UI.info "推送podspec：`#{@pod_target}`失败，#{e.to_s}".red
-          return false
+        
+        start_time = Time.now
+        timeout = ENV['PODSPEC_PUSH_TIMEOUT'] ? ENV['PODSPEC_PUSH_TIMEOUT'].to_i : 15 # Default 15 seconds timeout
+        last_error = nil
+
+        while (Time.now - start_time) < timeout
+          begin
+            push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
+            push.validate!
+            push.run
+            return true
+          rescue Pod::StandardError => e
+            last_error = e
+            remaining_time = timeout - (Time.now - start_time)
+            if remaining_time > 0
+              UI.info "推送podspec：`#{@pod_target}`失败，将在#{remaining_time.round(1)}秒后重试，错误：#{e.to_s}".yellow
+              sleep(1) # Wait 1 second before retrying
+            end
+          end
         end
+
+        UI.info "推送podspec：`#{@pod_target}`失败，已超过#{timeout}秒重试时间，跳过此次处理，错误：#{last_error.to_s}".red
+        return false
       end
 
       private

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

@@ -17,6 +17,20 @@ module Pod
       if !lockfile.nil? && lockfile.internal_data.empty?
         @lockfile = Lockfile.from_file(config.lockfile_path) if config.lockfile_path
       end
+
+      podfile.use_source_pods.each do |name|
+        # 如果lockfile存在，移除external_source_pods和checkout_options中的name元素
+        if !lockfile.nil? && lockfile.internal_data && lockfile.internal_data['EXTERNAL SOURCES']
+          # 从external_source_pods中移除
+          lockfile.internal_data['EXTERNAL SOURCES'].delete(name)
+        end
+
+        if !lockfile.nil? && lockfile.internal_data && lockfile.internal_data['CHECKOUT OPTIONS']
+          # 从checkout_options中移除
+          lockfile.internal_data['CHECKOUT OPTIONS'].delete(name)
+        end
+      end
+
       mtxx_create_analyzer(plugin_sources)
     end
 
@@ -60,6 +74,25 @@ module Pod
 
       UI.section 'Analyzing dependencies' do
         analyze(analyzer)
+        excluded_names = PodUpdateConfig.external_source
+                                        .map { |s| s[:name] }
+                                        .compact
+                                        .uniq
+
+        if excluded_names
+          filtered_pod_targets = @pod_targets.select do |pod_target|
+            excluded_names.include?(pod_target.pod_name)
+          end
+
+          filtered_pod_targets.each do |pod_target|
+            # puts pod_target.pod_name
+            UI.puts "pod_time_profiler: predownloaded_pods_binary: #{pod_target.pod_name}".green
+            # if pod_target.should_build?
+            # end
+             sandbox.predownloaded_pods.delete(pod_target.pod_name)
+          end
+        end
+
         validate_build_configurations
       end
 
@@ -69,6 +102,7 @@ module Pod
       end if deployment?
       cost_time_hash['prepare'] = PodUpdateConfig.prepare_time
       cost_time_hash['resolve_dependencies'] = Time.now - start_time
+
       analyzer
     end
 
@@ -123,6 +157,7 @@ module Pod
       source_pods = []
       bin_pods = []
       @pod_targets.map do |target|
+        target.uses_swift?
         if target.should_build?
           source_pods << target
         else

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

@@ -59,7 +59,34 @@ module Pod
         }
         Lockfile.new(hash)
       end
-
+      # def generate_external_sources_data(podfile)
+      #   excluded_names = PodUpdateConfig.external_source
+      #                                   .map { |s| s[:name] }
+      #                                   .compact # 过滤空值[1]
+      #                                   .uniq
+      #   deps = podfile.dependencies.select(&:external?)
+      #   deps = deps.sort { |d, other| d.name <=> other.name }
+      #   sources = {}
+      #   deps.each { |d| sources[d.root_name] = d.external_source }
+      #   sources
+      # end
+      #根据 CocoaPods 依赖处理机制，修改后的方法应增加过滤逻辑：
+      def generate_external_sources_data(podfile)
+        excluded_names = PodUpdateConfig.external_source
+                    .map { |s| s[:name] }
+                    .compact # 过滤nil值
+                    .uniq   # 去重
+                    
+        deps = podfile.dependencies.select(&:external?)
+        
+        deps = deps.reject { |d| excluded_names.include?(d.root_name) } if excluded_names.any?
+        
+        deps = deps.sort { |d, other| d.name <=> other.name }
+        
+        sources = {}
+        deps.each { |d| sources[d.root_name] = d.external_source }
+        sources
+      end
       def generate_spec_repos(spec_repos)
         result = Hash.new
         spec_repos.map do |source, specs|

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'
@@ -114,32 +112,75 @@ module Pod
         end.uniq
         @platforms_by_dependency.each_value(&:uniq!)
 
-        # 遍历locked_dependencies，将二进制版本号的最后一位删掉
+        # 遍历locked_dependencies，
+        # 1) 将二进制版本号的最后一位删掉
+        # 2) 移除 external_source（去锁定）
         locked_dependencies.each do |value|
           next if value.nil?
           # 获取 Pod::Dependency
           dep = value.payload
-          next if dep.external_source
-          # 修改版本号限制
+
+          # 移除 external_source，使其走常规源解析
+          external_source = dep.external_source
+          if external_source
+            external_source = nil
+          else
+            # 非external_source 仍保持不动，直接跳过
+            next if dep.external_source
+          end
+
+          # 修改版本号限制（移除 bin 后缀）
           requirements = dep.requirement.as_list.map do |req|
             req_arr = req.split('.').delete_if { |r| r.include?('bin') }
             req_arr.join('.')
           end
+
           # 重新生成 Pod::Dependency
-          dep = Dependency.new(dep.name, requirements, {:source => dep.podspec_repo, :external_source => dep.external_source})
+          dep = Dependency.new(dep.name, requirements, {:source => dep.podspec_repo, :external_source => external_source})
           value.payload = dep
         end
 
         start_time = Time.now
         @activated = Molinillo::Resolver.new(self, self).resolve(dependencies, locked_dependencies)
         UI.puts "pod_time_profiler: Molinillo resolve耗时:#{'%.1f' % (Time.now - start_time)}s".green
-        #记录podfile 中commit 使用的组件map，提供后面二进制版本生成使用
-        PodUpdateConfig.set_external_source_commit
+        start_time = Time.now
+        external_source_pods = @podfile_dependency_cache.podfile_dependencies.select(&:external_source).map(&:root_name).uniq
+        checkout_options = sandbox.checkout_sources.select { |root_name, _| external_source_pods.include? root_name }
+
+        if podfile.use_binaries?
+          PodUpdateConfig.parse_checkout_options_from_specs(checkout_options,podfile)
+        end
+        all_pods = {}
+        @activated.vertices.each do |vertex|
+          all_pods[ "#{vertex[1].name.split("/").first }"] =  vertex[1].payload.version.version
+        end
+        result = {}
+        all_pods.each do |key ,version|
+          vertex = @activated.vertices[key]
+          deps = get_all_dependencies(vertex)
+          pod_names = ""
+          deps.each do |name ,version|
+            checkout_option = PodUpdateConfig.get_checkout_option(name,podfile)
+            if checkout_option
+              name_version =  "#{name.split("/").first }_#{checkout_option}"
+              pod_names  << "|" << name_version unless pod_names.include?(name_version)
+            else
+              name_version = "#{name.split("/").first }_#{version[:version].version}"
+              pod_names << "|" << name_version unless pod_names.include?(name_version)
+            end
+
+          end
+          result[key] = pod_names
+        end
+        PodUpdateConfig.set_dependency_relationships(result)
+        UI.puts "pod_time_profiler: dependency_relationships:#{'%.1f' % (Time.now - start_time)}s".green
         resolver_specs_by_target
       rescue Molinillo::ResolverError => e
         handle_resolver_error(e)
       end
 
+
+
       old_resolver_specs_by_target = instance_method(:resolver_specs_by_target)
       define_method(:resolver_specs_by_target) do
         specs_by_target = old_resolver_specs_by_target.bind(self).call
@@ -165,6 +206,7 @@ module Pod
                                 []
                               end
 
+
           # Parallel.map(rspecs, in_threads: 8) do |rspec|
           specs_by_target[target] = rspecs.map do |rspec|
             # 含有 subspecs 的组件暂不处理
@@ -172,8 +214,13 @@ module Pod
 
             # developments 组件采用默认输入的 spec (development pods 的 source 为 nil)
             # 可以使 :podspec => "htts://IMYFoundation.podspec"可以走下去，by slj
+            dependency_source = PodUpdateConfig.get_checkout_option(rspec.root.name,podfile)
+
             unless rspec.spec.respond_to?(:spec_source) && rspec.spec.spec_source
-              next rspec
+
+              if dependency_source.nil?
+                next rspec
+              end
             end
 
             # 采用二进制依赖并且不为开发组件
@@ -181,7 +228,7 @@ module Pod
             if use_binary
               source = sources_manager.binary_source
               configuration = ENV['configuration'] || podfile.configuration
-              spec_version = version_helper.version(rspec.root.name, rspec.spec.version, specifications, configuration, podfile.include_dependencies?)
+              spec_version = version_helper.version(rspec.root.name,  rspec.spec.version, specifications, configuration, podfile.include_dependencies?)
             else
               # 获取podfile中的source
               podfile_sources = podfile.sources.uniq.map { |source| sources_manager.source_with_name_or_url(source) }
@@ -211,7 +258,7 @@ module Pod
               # 这里可能出现分析依赖的 source 和切换后的 source 对应 specification 的 subspec 对应不上
               # 造成 subspec_by_name 返回 nil，这个是正常现象
               next unless specification
-
+              is_exist_binary_version = true
               used_by_only = if Pod.match_version?('~> 1.7')
                                rspec.used_by_non_library_targets_only
                              else
@@ -228,12 +275,31 @@ module Pod
               # 没有从新的 source 找到对应版本组件，直接返回原 rspec
               missing_binary_specs << rspec.spec if use_binary
               # UI.message "【#{rspec.spec.name} | #{rspec.spec.version}】组件无对应源码版本 , 将采用二进制版本依赖.".red unless use_binary
+              is_exist_binary_version = false
               rspec
             end
+            # 有对应二进制组件版本才进行替换记录，否则走之前pre-downloading 逻辑
+            if is_exist_binary_version && sandbox.predownloaded?(rspec.root.name) && spec_version.is_a?(String) && spec_version.include?("bin")
+              PodUpdateConfig.set_external_source({"name":rspec.root.name,"source":dependency_source})
+            end
+            if $ARGV.include?("bin") || !is_exist_binary_version
+              # 记录为制作的 external_source 组件，为后续二进制制作准备
+              if dependency_source && spec_version.is_a?(String) && spec_version.include?("bin")
+                PodUpdateConfig.set_external_source_binary({"name":rspec.root.name,"source":dependency_source})
+              end
+            end
+
             rspec
           end.compact
         end
 
+        def print_dependency_tree(vertex, indent = 0)
+          puts "#{'  ' * indent}#{vertex.name} (#{vertex.payload&.version || '?'})"
+
+          vertex.outgoing_edges.each do |edge|
+            print_dependency_tree(edge.destination, indent + 1)
+          end
+        end
         # if missing_binary_specs.any?
         #   missing_binary_specs.uniq.each do |spec|
         #     # UI.message "【#{spec.name} | #{spec.version}】组件无对应二进制版本 , 将采用源码依赖." unless spec.root.source[:type] == 'zip'
@@ -273,6 +339,59 @@ module Pod
                             CBin::BuildAll::BinHelper.new
                           end
     end
+
+    # 获取组件的所有依赖(包括直接和间接依赖)
+    def get_all_dependencies(vertex, visited = Set.new, dependencies = {})
+      return dependencies if vertex.nil? || visited.include?(vertex.name)
+
+      visited.add(vertex.name)
+
+      # 添加当前组件信息
+      dependencies[vertex.name] = {
+        version: vertex.payload&.version,
+        dependencies: {}
+      }
+
+      # 递归处理所有直接依赖
+      vertex.outgoing_edges&.each do |edge|
+        dest_vertex = edge.destination
+        next if dest_vertex.nil?
+        
+        dep_name = dest_vertex.name
+
+        # 记录直接依赖信息
+        dependencies[vertex.name][:dependencies][dep_name] = {
+          version: dest_vertex.payload&.version,
+          requirement: edge.requirement&.to_s
+        }
+
+        # 递归获取间接依赖
+        get_all_dependencies(dest_vertex, visited, dependencies)
+      end
+
+      dependencies
+    end
+
+    # 打印组件的所有依赖树
+    def print_dependency_tree(vertex, indent = 0, visited = Set.new)
+      return if visited.include?(vertex.name)
+      visited.add(vertex.name)
+
+      puts "#{'  ' * indent}#{vertex.name} (#{vertex.payload&.version || '?'})"
+
+      vertex.outgoing_edges.each do |edge|
+        print_dependency_tree(edge.destination, indent + 1, visited)
+      end
+    end
+
+    # 获取所有组件的完整依赖关系
+    def get_all_components_dependencies
+      result = {}
+      @activated.vertices.each do |name, vertex|
+        result[name] = get_all_dependencies(vertex)
+      end
+      result
+    end
   end
 
   if Pod.match_version?('~> 1.4.0')

metadata

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