cocoapods-bb-PodAssistant 0.3.12.5 → 0.3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e50e664fa0119dbfae913afa7be868479ff7bbf10b0400cbae0c001e964b383
-  data.tar.gz: eb86977077f139ac0d9d807cb9576bb3fdc2b121c4eab9568c6af4f53cdf7d19
+  metadata.gz: e987c7880cf9a36436c3340d58f869212e12862eb34a7035d65a1240c37fa6e1
+  data.tar.gz: 6d4ecac719da36fcee693b1f14527245bf8a731d3395e784b071af5c0376adc3
 SHA512:
-  metadata.gz: 83815f36081eddb0f0e48c4cbd839244146ff54708d9876337b67bc31d7ffc84535ba268b1e5a1e246c43e8ad69fd5e0cb80ea176a226ef3db67922aa3e60a5d
-  data.tar.gz: 24e79b6a25942fb56e92a434bdba323eaf184a8ea13106a0e1c7f5a061942b3389ee2a8e7e97948d213f74bbb261746c0c88ec6c380d21fe1cd9a884bb466d27
+  metadata.gz: 2654efaca16ff583496a8f218538b65f6e917580599299bbd2f6f476d62ebc680b1f430c0c46efaf5465adfc0dc41b15ff4b92d8d183e50c0641b280fc49b8d6
+  data.tar.gz: c4212306220fb74f197dd8040e623e9aa7980665e0f3ddf3db0a318c81ee1d94bb7b48eba86628683123b660549b5501e75e18f7daa5c619887db3c0bfdb9305

data/lib/cocoapods-bb-PodAssistant/babybus/installer/post_install_hooks.rb

@@ -97,10 +97,28 @@ class PodPostInstaller
         end
     end
 
+    private def generate_other_ldflags()
+        # new_flags = ['$(inherited)', '-ObjC', '-lxml2', '-lz', '-lstdc++', '-weak_framework', 'SwiftUI', '-Wl,-v', '-Wl,-no_deduplicate']
+        new_flags = ['$(inherited)', '-ObjC', '-lxml2', '-lz', '-lc++', '-weak_framework', 'SwiftUI', '-Wl,-v', '-Wl,-no_deduplicate']
+        is_above_xcode26 = BB::PodUtils.above_xcode_26_version # 高于26
+        is_above_xcode15 = BB::PodUtils.compare_xcode_15_version # 高于15
+        if (is_above_xcode26 == true) then
+            # 从 Xcode 15.3 起，Apple 已正式废弃 ld-classic，而 Xcode 26 beta 默认强制使用新版链接器（ld64 764.0+）。
+            new_flags << '-Wl,-no_application_extension'
+            new_flags << '-Wl,-ld_classic'
+        elsif (is_above_xcode15 == true) then # iOS17适配添加ld64 https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes
+            # c++ weak 标识 xcode15 -ld64 is deprecated, use -ld_classic instead
+            new_flags << '-Wl,-ld_classic'
+        end
+        # 去重并规范化输出
+        new_flags.uniq.join(' ')
+    end
+
     def run
         env = BabybusInstallEnv.new()
-        is_above_xcode15 = BB::PodUtils.compare_xcode_15_version # 高于15
-        is_below_xcode15 = BB::PodUtils.below_xcode_15_version # 低于15
+        # is_above_xcode26 = BB::PodUtils.above_xcode_26_version # 高于26
+        # is_above_xcode15 = BB::PodUtils.compare_xcode_15_version # 高于15
+        # is_below_xcode15 = BB::PodUtils.below_xcode_15_version # 低于15
         # 是否Untify项目
         isUnityProject = isUnityApp
         # Untify项目需要移除cocos项目res/src目录
@@ -111,6 +129,8 @@ class PodPostInstaller
         puts "pod组件配置工程最低支持iOS系统 ===> #{ios_deployment_target.to_s.send(:red)}".green
         @lib.aggregate_targets.first.user_project.save # 解决Xcode13 pod update操作出现failed to save pods.xcodeproj问题 by hm 21/11/8
         project = Xcodeproj::Project.open(BB::PodUtils.getXcodeprojPath)
+        should_save = false
+        new_ldflags = generate_other_ldflags()
         project.targets.each do |target|
             target.build_configurations.each do |config|
                 # if !target.name.include? 'test'
@@ -125,19 +145,19 @@ class PodPostInstaller
                         end
                     end
                     # xcode_version = `xcrun xcodebuild -version | grep Xcode | cut -d' ' -f2`.to_f   if xcode_version ≥ 15
-                    # iOS17适配添加ld64 https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes
-                    if (is_above_xcode15 == true) then
-                        # c++ weak 标识 xcode15 -ld64 is deprecated, use -ld_classic instead
-                        config.build_settings['OTHER_LDFLAGS'] = "$(inherited) -lxml2 -lz -ObjC -lstdc++ -Wl -ld_classic -weak_framework SwiftUI"
+                    key = 'OTHER_LDFLAGS'
+                    old_ldflags = Array(config.build_settings[key]).join(' ').strip
+                    if old_ldflags != new_ldflags
+                        config.build_settings[key] = new_ldflags
+                        should_save = true
+                        puts "[Updated] #{target.name} #{config.name}: OTHER_LDFLAGS changed Value: #{new_ldflags}".green
                     else
-                        config.build_settings['OTHER_LDFLAGS'] = "$(inherited) -lxml2 -lz -ObjC -lstdc++"
+                        puts "[Skipped] #{target.name} #{config.name}: already up-to-date".yellow
                     end
-                    otherLink_setting_value = config.build_settings['OTHER_LDFLAGS']
-                    puts "#{target.name}-#{config.name} Build Setting 'OTHER_LDFLAGS' Value: #{otherLink_setting_value}"
-
                     # 配置工程最低部署
                     origin_value = config.build_settings['IPHONEOS_DEPLOYMENT_TARGET']
                     if origin_value.to_i != ios_deployment_target.to_i
+                        should_save = true
                         config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_target.to_s
                         new_value = config.build_settings['IPHONEOS_DEPLOYMENT_TARGET']
                         puts "#{target.name}-#{config.name} Build Setting 'IPHONEOS_DEPLOYMENT_TARGET' deployment target: #{origin_value} => #{new_value}"
@@ -201,10 +221,8 @@ class PodPostInstaller
             if fix_phases
                 fix_phases.always_out_of_date = "1"
             end
-            if (is_below_xcode15 == true) then
-                project.save
-            end
         end
+        project.save if should_save
         # 修正Xcode16不能po问题
         fix_above_xcode16_no_po()
     end

data/lib/cocoapods-bb-PodAssistant/command/stable/push.rb

@@ -11,11 +11,17 @@ module Pod
           常用命令如下：\n
           更新所有公共组件: `pod stable push`\n
           更新指定公共组件: `pod stable push <组件名称>`\n
+          更新指定spec公共组件: `pod stable push <组件名称> --stable-specs-index=spec 索引`\n
           更新指定公共组件/移除组件: `pod stable push <组件名称> --remove=组件名称` #多个移除名称带`,`\n
           更新指定公共组件/带依赖关系: `pod stable push <组件名称> --dependencies=组件名称` #多个依赖名称带`,`\n
           更新指定公共组件/带依赖关系/移除组件: `pod stable push <组件名称> --dependencies=组件名称 --remove=组件名称` #多个依赖名称带`,`\n
-          参数说明:--dependencies 依赖组件 --remove 需要移除组件 --update-matrix 更新矩阵产品公共业务线 --update-common 更新公共组件
+          参数说明:\n
+          --dependencies=依赖组件\n   
+          --remove=需要移除组件\n 
+          --stable-specs-index=指定业务specs索引-0:公共(默认) 1:矩阵全线升级 2:拉布 3:科学 4:思维\n
         DESC
+        #   --update-matrix 更新矩阵产品公共业务线\n 
+        #   --update-common 更新公共组件\n
 
         self.arguments = [
             CLAide::Argument.new('POD_NAMES', false, true),
@@ -25,8 +31,7 @@ module Pod
             [
                 ['--dependencies', '依赖组件名称，多个使用`,`隔开'],
                 ['--remove', '移除公共组件名称，多个使用`,`隔开'],
-                ['--update-matrix', '更新[矩阵]产品公共业务线,默认true'],
-                ['--update-common', '更新公共组件,默认false'],
+                ['--stable-specs-index', '指定业务specs索引-0:公共(默认) 1:矩阵全线升级 2:拉布 3:科学 4:思维，参照podfile配置信息'],
             ].concat(super)
         end
 
@@ -34,65 +39,99 @@ module Pod
             @pods = argv.arguments!
             @dependencies = argv.option('dependencies', nil)&.split(',')
             @remove = argv.option('remove', nil)&.split(',')
-            @is_pub = argv.flag?('update-common', false)
-            @is_matrix = !@is_pub # argv.flag?('update-matrix', true)
+            @version = argv.option('version')
+            @stable_specs_index = argv.option('stable-specs-index', 0).to_i
+            @is_public_data = false
             super
         end
 
         def run
             puts "[PodAssistant] 开始执行 $ pod stable push".yellow
-            source_manager = BB::SourceManager.new(false, @is_matrix)
+            puts "stable_specs_project_name:#{get_stable_project_name} stable_specs_name:#{get_stable_spec_name}"
+
+            source_manager = BB::SourceManager.new(false, get_stable_spec_name)
             cachePath = source_manager.cache_path
             puts "stable cache git=>#{cachePath}"
             Dir.chdir(File.join(cachePath)) { 
-                # puts "pwd:#{`pwd`}".green
-                path = @is_matrix ? matrix_stable_path : common_stable_path
-                Dir.chdir(File.join(path)) {
-                    commit_msg = ""
-                    if @pods.any?
-                        if (@pods.length > 1) && (@dependencies)
-                            puts "❌ 无效指令，不能处理多个组件#{@pods}依赖，更新组件仅支持单组件".red
-                            puts "举例：pod stable push <单组件> --dependencies=<多组件>".green
-                            puts "详见 pod stable push --help".green
-                            system "pod stable push --help"
-                            exit
-                        elsif (@pods.length == 1) && (@dependencies || @remove)
-                            pod_name=@pods.first
-                            dependencies_hash = {}
-                            if @dependencies
-                                dependencies_hash[pod_name] = @dependencies
+                path = get_stable_project_path
+                # puts "path:#{path}".red
+                if Dir.exist?(path)
+                    Dir.chdir(File.join(path)) {
+                        commit_msg = ""
+                        if @pods.any?
+                            if (@pods.length > 1) && (@dependencies)
+                                puts "❌ 无效指令，不能处理多个组件#{@pods}依赖，更新组件仅支持单组件".red
+                                puts "举例：pod stable push <单组件> --dependencies=<多组件>".green
+                                puts "详见 pod stable push --help".green
+                                system "pod stable push --help"
+                                exit
+                            elsif (@pods.length == 1) && (@dependencies || @remove)
+                                pod_name=@pods.first
+                                dependencies_hash = {}
+                                if @dependencies
+                                    dependencies_hash[pod_name] = @dependencies
+                                end
+                                if @is_public_data
+                                    source_manager.update_common_dependencies_and_remove_data(dependencies_hash, @remove)
+                                else
+                                    source_manager.update_business_dependencies_and_remove_data(dependencies_hash, @remove)
+                                end
                             end
-                            if @is_matrix
-                                source_manager.update_business_dependencies_and_remove_data(dependencies_hash, @remove)
-                            else
-                                source_manager.update_common_dependencies_and_remove_data(dependencies_hash, @remove)
+                            pods_str = @pods.join(" ")
+                            system "pod stable update #{pods_str}"
+                            commit_msg = "update pod #{pods_str}"
+                        else
+                            if (@dependencies) || (@remove)
+                                puts "❌ 无效指令，没有制定组件名称 详见 pod stable push --help".red
+                                system "pod stable push --help"
+                                exit
                             end
+                            system "pod stable update"
                         end
-                        pods_str = @pods.join(" ")
-                        system "pod stable update #{pods_str}"
-                        commit_msg = "update pod #{pods_str}"
-                    else
-                        if (@dependencies) || (@remove)
-                            puts "❌ 无效指令，没有制定组件名称 详见 pod stable push --help".red
-                            system "pod stable push --help"
-                            exit
-                        end
-                        system "pod stable update"
-                    end
-                    # 提交spec本地lock依赖，避免pod stable push <组件>出现组件版本回退问题
-                    source_manager.commit_localspec_data(@is_matrix, commit_msg)
-                }
+                        # 提交spec本地lock依赖，避免pod stable push <组件>出现组件版本回退问题
+                        source_manager.commit_localspec_data(commit_msg)
+                    }
+                else
+                    puts "❌ 无效stable工程，请确认：#{get_stable_project_name}是否创建，at@hm".red
+                    exit
+                end
             }
         end
-
-        # 公共stable目录
-        private def common_stable_path
-            return File.join(Dir.pwd, 'Common_Stable')
+        # 0:公共(默认) 1:矩阵全线升级 2:拉布 3:科学 4:思维
+        private def get_stable_spec_name
+            case @stable_specs_index
+            when 1 # 全线矩阵产品公共stable目录
+                return 'global_stable_specs'
+            when 2 # labu产品公共stable目录
+                return 'labu_stable_specs'
+            when 3 # science产品公共stable目录
+                return 'science_stable_specs'
+            when 4 # math产品公共stable目录
+                return 'math_stable_specs'
+            else # 公共stable目录
+                return 'stable_specs'
+            end
         end
-        # 全线矩阵产品公共stable目录
-        private def matrix_stable_path
-            return File.join(Dir.pwd, 'Matrix_Common_Stable')
+        # 0:公共(默认) 1:矩阵全线升级 2:拉布 3:科学 4:思维
+        private def get_stable_project_name
+            case @stable_specs_index
+            when 1 # 全线矩阵产品公共stable目录
+                return 'Matrix_Common_Stable'
+            when 2 # labu产品公共stable目录
+                return 'labu_Common_Stable'
+            when 3 # science产品公共stable目录
+                return 'science_Common_Stable'
+            when 4 # math产品公共stable目录
+                return 'math_Common_Stable'
+            else # 公共stable目录
+                @is_public_data = true
+                return 'Common_Stable'
+            end
         end
+        private def get_stable_project_path
+            return File.join(Dir.pwd, get_stable_project_name)
+        end
+
       end
     end
   end

data/lib/cocoapods-bb-PodAssistant/config/source_manager.rb

@@ -8,9 +8,9 @@ require 'cocoapods-bb-PodAssistant/config/data_config'
 # 数据源管理
 module BB
     class SourceManager
-        def initialize(verify_stable_env=true, isMatrix=false)
-            @env = BB::StableEnv.new(verify_stable_env, isMatrix)
-            @businessSpecName = @env.business_stable
+        def initialize(verify_stable_env=true, businessSpec=nil)
+            @env = BB::StableEnv.new(verify_stable_env, businessSpec)
+            @businessSpecName = businessSpec
             @stableMgr = BB::StableManager.new(@env, verify_stable_env)
         end
 
@@ -197,13 +197,8 @@ module BB
         def update_business_dependencies_and_remove_data(dependencies_pods, remove_pods)
             update_dependencies_and_remove_data(business_stable_yaml, business_stable_datas, dependencies_pods, remove_pods)
         end
-        def commit_localspec_data(is_matrix, commit_msg)
-            if is_matrix
-                stable_yaml = business_stable_yaml
-            else
-                stable_yaml = public_stable_yaml
-            end
-            commit_git_data(stable_yaml, commit_msg)
+        def commit_localspec_data(commit_msg)
+            commit_git_data(business_stable_yaml, commit_msg)
         end
         def commit_git_data(stable_yaml, commit_msg)
             @stableMgr.commit_data(stable_yaml, commit_msg)
@@ -221,7 +216,7 @@ module BB
             dependenciesdata = common_specs[YAML_CONFIG_DEPENDENCIES_KEY]
 
             # puts "local_specs:#{local_specs}".send(:green)
-            # puts "common_specs:#{common_specs}".send(:green)
+            # puts "common_specs:#{common_specs}".send(:red)
             need_update_pod_lists={}
             # step.1 匹配组件版本信息
             listdata.each do |name, version|
@@ -292,12 +287,30 @@ module BB
             showMergeLog(added_projects, updated_projects, rollbacked_projects, deleted_projects)
             # step.4 强制更新组件
             if is_force == true
-                puts "强制升级组件#{update_pods}".red
+                puts "[update]升级组件#{update_pods}".red
+                business_listdata = {}
+                # 业务线数据
+                business_config_file = business_stable_yaml
+                if business_config_file
+                    if File.exist?(business_config_file)
+                        busimessSpec = BB::StableSpecs.new()
+                        busimess_data = busimessSpec.readData(business_config_file)
+                        if busimess_data
+                            business_listdata = busimess_data[YAML_CONFIG_LIST_KEY]
+                        end
+                    end
+                end
                 update_pods.each do |pod_name|
-                    pod = new_specs[pod_name]
-                    if (pod.is_a? String) && !pod.include?('>=')
-                        puts "强制升级name:#{pod_name} (>= #{pod})".red
-                        new_specs[pod_name] = ">= #{pod}"
+                    business_ver = business_listdata[pod_name]
+                    if business_ver
+                        puts "[update]业务spec专属组件库升级信息:#{pod_name} (#{business_ver})".yellow
+                        new_specs[pod_name] = "= #{business_ver}"
+                    else
+                        pod = new_specs[pod_name]
+                        if (pod.is_a? String) && !pod.include?('>=')
+                            puts "[update]公共组件库升级信息:#{pod_name} (>= #{pod})".yellow
+                            new_specs[pod_name] = ">= #{pod}"
+                        end
                     end
                 end
             end

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

@@ -1,3 +1,3 @@
 module CocoapodsBbPodassistant
-  VERSION = "0.3.12.5"
+  VERSION = "0.3.13.0"
 end

data/lib/cocoapods-bb-PodAssistant/helpers/pod_utils.rb

@@ -170,5 +170,21 @@ module BB
             end
             return false
         end
+        # xcode26以下
+        def self.below_xcode_26_version
+            return !above_xcode_26_version
+        end
+        # xcode26以上
+        def self.above_xcode_26_version
+            current_version = xcode_version
+            if current_version.nil?
+                puts "未找到安装的Xcode版本。".red
+            else
+                puts "当前Xcode版本：#{current_version}"
+                num_ver = current_version.to_i
+                return  num_ver >= 26
+            end
+            return false
+        end
     end
 end

data/lib/cocoapods-bb-PodAssistant/helpers/stable_env_helper.rb

@@ -2,9 +2,9 @@ require 'cocoapods-bb-PodAssistant/config/stable_source'
 
 module BB
     class StableEnv  
-        def initialize(verify_stable_env=true, isMatrix=false)
+        def initialize(verify_stable_env=true, businessSpec=nil)
             @cache = BB::Cache.new(nil, verify_stable_env)
-            @isMatrix = isMatrix
+            @businessSpec = businessSpec
             configGitPath(@cache.cachePath)
             if verify_stable_env
               # 自动加载stable环境
@@ -102,14 +102,8 @@ module BB
           return @stable_tag
         end
         def business_stable
-          if @businessSpec.nil? && @isMatrix
-            return default_matrix_business_stable
-          end
           return @businessSpec
         end
-        def default_matrix_business_stable
-          return "global_stable_specs"
-        end
         # 验证stable环境是否存在
         def verify_stable_env_exists
           return @stable_source.empty? ? false : true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-PodAssistant
 version: !ruby/object:Gem::Version
-  version: 0.3.12.5
+  version: 0.3.13.0
 platform: ruby
 authors:
 - humin