cocoapods-meitu-bin 1.4.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d866fcda4827c97d86810fa175e8f2e94ba8b9b7cb5fddba738168a39de9e209
-  data.tar.gz: 1ba573957dfc51fa2cc2b4f42ab483864b78d4f57c59280be20d31b758950d9a
+  metadata.gz: 44b755bd80acc307a5c25f91cd7d07911fb0f81df3342739a3e099bdbc3eb6e0
+  data.tar.gz: fc5c280e229de927df2e429da8494146de709d16429ecc143e05447244ad34a8
 SHA512:
-  metadata.gz: 828c4415a0cb11b9d920a804e59285e1b41d215d96804917e641e8c0438165c565c519ea715bbccc4381aaf1a90c63067166bc9777548f954cd7c00116270866
-  data.tar.gz: 1ad302d1311dca387411bd59ba4333a17ffcd81f59bed55059dfee8d70b9f74d53679394fe94696c7fd9b30261ac9b03a98bdf6fcffe5e31eb031135d16b7f47
+  metadata.gz: e23a6e77f03c087df977c2d23418e2b5a3da59eca718923dfe9653136dd9ef8252c4596b59ddc1c1c3160b19e810b980f049ffd3303183eb5ce25d61ceea89cf
+  data.tar.gz: 20441e3f37762cb9c2039fc1a0bffbbfe1f899d2ec64693570008f4489b27c4f8e17a402dfe7cc01fe3b05a085f51e8aa241219d23ba47772659465b2d32d334

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

@@ -16,7 +16,6 @@ require 'cocoapods-meitu-bin/command/bin/source'
 require 'cocoapods-meitu-bin/helpers'
 require 'cocoapods-meitu-bin/helpers/framework_builder'
 require 'cocoapods-meitu-bin/native/clean'
-require 'cocoapods-meitu-bin/native/verify'
 module Pod
   class Command
     # This is an example of a cocoapods plugin adding a top-level subcommand

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

@@ -3,6 +3,7 @@ require 'cocoapods-meitu-bin/native/podfile'
 require 'cocoapods-meitu-bin/native/podfile_env'
 require 'cocoapods/generate'
 require 'cocoapods'
+require 'ostruct'
 module CBin
   class Config
     def config_file
@@ -164,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 = "1.4.1"
+  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/helpers/buildAll/builder.rb

@@ -352,23 +352,24 @@ ibtool \
         fwks_dir = "#{result_product_dir}/fwks"
         FileUtils.mkdir(fwks_dir) unless File.exist?(fwks_dir)
         fwks.map do |fwk|
-          new_fwk = get_XCFrameworkIntermediates_path(fwk)
-          if new_fwk && File.exist?(new_fwk)
-            `rsync -av #{new_fwk} #{fwks_dir}`
-          else
-            `rsync -av #{fwk} #{fwks_dir}`
-          end
-        end
-      end
-      def get_XCFrameworkIntermediates_path(path)
-        # 使用正则表达式匹配并提取 AdsFramework
-        match = path.to_s.match(/\/([^\/]+)\.xcframework/)
-        if match
-          framework_path = "#{product_dir}/#{iphoneos}/XCFrameworkIntermediates/#{match[1]}/#{match[1]}.framework"
-          return framework_path
+          `rsync -av #{fwk} #{fwks_dir}`
+          # new_fwk = get_XCFrameworkIntermediates_path(fwk)
+          # if new_fwk && File.exist?(new_fwk)
+          #   `rsync -av #{new_fwk} #{fwks_dir}`
+          # else
+          #   `rsync -av #{fwk} #{fwks_dir}`
+          # end
         end
-        return  nil
       end
+      # def get_XCFrameworkIntermediates_path(path)
+      #   # 使用正则表达式匹配并提取 AdsFramework
+      #   match = path.to_s.match(/\/([^\/]+)\.xcframework/)
+      #   if match
+      #     framework_path = "#{product_dir}/#{iphoneos}/XCFrameworkIntermediates/#{match[1]}/#{match[1]}.framework"
+      #     return framework_path
+      #   end
+      #   return  nil
+      # end
 
       # 拷贝 framework
       def copy_framework

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

@@ -27,7 +27,7 @@ module CBin
         # 处理vendored_libraries和vendored_frameworks
         spec['vendored_libraries'] = "#{root_dir}/libs/*.a"
         #兼容.xcframework
-        spec['vendored_frameworks'] = %W[#{root_dir} #{root_dir}/fwks/*.framework]
+        spec['vendored_frameworks'] = %W[#{root_dir} #{root_dir}/fwks/*.{framework,xcframework}]
         # 处理资源
         resources = %W[#{root_dir}/*.{#{special_resource_exts.join(',')}} #{root_dir}/resources/*]
         spec['resources'] = resources

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

@@ -23,6 +23,10 @@ module Pod
 
       # 并发执行个数
       option :multi_threads_count, 4
+
+      # 默认并发下载
+      defaults.delete('parallel_pod_downloads')
+      option :parallel_pod_downloads, true
     end
   end
 end

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

@@ -6,14 +6,17 @@ module Pod
   class Installer
     class PodSourceInstaller
       attr_accessor :installation_options
-
-      alias old_verify_source_is_secure verify_source_is_secure
-      def verify_source_is_secure(root_spec)
-        # http source 默认不警告
-        if installation_options.warn_for_unsecure_source?
-          old_verify_source_is_secure(root_spec)
-        end
-      end
     end
+    # class PodSourceDownloader
+    #   attr_accessor :installation_options
+    #
+    #   alias old_verify_source_is_secure verify_source_is_secure
+    #   def verify_source_is_secure(root_spec)
+    #     # http source 默认不警告
+    #     if installation_options.warn_for_unsecure_source?
+    #       old_verify_source_is_secure(root_spec)
+    #     end
+    #   end
+    # end
   end
 end

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: 1.4.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-28 00:00:00.000000000 Z
+date: 2025-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -164,7 +164,6 @@ files:
 - lib/cocoapods-meitu-bin/native/specification.rb
 - lib/cocoapods-meitu-bin/native/target_validator.rb
 - lib/cocoapods-meitu-bin/native/validator.rb
-- lib/cocoapods-meitu-bin/native/verify.rb
 - lib/cocoapods-meitu-bin/source_provider_hook.rb
 - lib/cocoapods_plugin.rb
 - spec/command/bin_spec.rb

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

@@ -1,107 +0,0 @@
-# 用于效验podfile相关准确性
-module Pod
-  class Command
-    class Bin < Command
-      class Verify < Bin
-        # self.abstract_command = true
-        self.summary = '效验podfile相关准确性'
-        self.description = <<-DESC
-          #{summary}，效验podfile相关准确性
-        DESC
-
-        def self.options
-          [
-            %w[--verify-podfile podfile是否正确且相关依赖正常],
-            %w[--verify-podfile-branch 效验podfile是否包含:branch=>'xxx'语法],
-          ].concat(super).uniq
-        end
-
-        def initialize(argv)
-          @verify_podfile = argv.flag?('verify-podfile', false)
-          @verify_podfile_branch = argv.flag?('verify-podfile-branch', false)
-          super
-        end
-
-        def run
-          # Pod::UI.puts "共删除#{size}二进制版本pod缓存".red
-
-          if @verify_podfile
-            analyzing_dependencies
-          end
-          if @verify_podfile_branch
-            verify_podfile_branch
-          end
-        end
-
-        private
-        def verify_podfile
-          begin
-             podfile
-          rescue Pod::DSLError => error
-            info ="podfile文件效验失败：#{error}"
-            raise Pod::DSLError.new(info, path, error, contents)
-          end
-          begin
-            analyzing_dependencies
-          rescue Pod::DSLError => error
-            # puts "podfile依赖分析失败：#{error}"
-            info = "podfile依赖分析失败：#{error}"
-            raise Pod::DSLError.new(info, path, error, contents)
-          end
-        end
-        def verify_podfile_branch
-          begin
-            podfile
-          rescue Pod::DSLError => error
-            info = "podfile文件效验失败：#{error.message}"
-            raise Pod::DSLError.new(info, path, error, contents)
-          end
-          podfile_obj = podfile
-          branch_list = []
-          podfile_obj.target_definitions.each do |target_name, target_definition|
-            target_definition.dependencies.each do |dependency|
-              if dependency.external_source
-                if dependency.external_source[:branch]
-                  branch = dependency.external_source[:branch]
-                  branch_list << "#{dependency.name}:#{branch}"
-                end
-              end
-            end
-          end
-          if branch_list.count > 0
-            Pod::UI.puts "podfile包含以下branch：#{branch_list}".red
-            Pod::UI.puts "请检查podfile是否包含 :branch => 'xxx' 语法".red
-
-            raise Pod::DSLError.new("合入develop分支不能使用branch,podfile包含branch,请检查：#{branch_list}", nil, nil, nil)
-          end
-        end
-        def analyzing_dependencies
-          analyzer = Pod::Installer::Analyzer.new(
-            sandbox,
-            podfile,
-            lockfile
-          )
-          analyzer.update_repositories
-          analyzer.analyze(true)
-        end
-        def podfile
-          @podfile ||=  Pod::Config.instance.podfile
-        end
-
-        # 获取 podfile.lock
-        def lockfile
-          @lockfile ||= Pod::Config.instance.lockfile
-        end
-
-        # 获取 sandbox
-        def sandbox
-          @sandbox ||=  Pod::Config.instance.sandbox
-        end
-        def clean_all_binary
-          # Your method implementation here
-
-        end
-      end
-    end
-  end
-end