cocoapods-bb-PodAssistant 0.3.12.5 → 0.3.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e50e664fa0119dbfae913afa7be868479ff7bbf10b0400cbae0c001e964b383
-  data.tar.gz: eb86977077f139ac0d9d807cb9576bb3fdc2b121c4eab9568c6af4f53cdf7d19
+  metadata.gz: ab54c5c6b56fecf79f80409e4640b1d490fd1a43cbb3cb25c6950d7b0e4ce41b
+  data.tar.gz: 3d9919e095514e2186967ede9e18cec1fb89aa6a6295ba687ce8f5c220c0b52c
 SHA512:
-  metadata.gz: 83815f36081eddb0f0e48c4cbd839244146ff54708d9876337b67bc31d7ffc84535ba268b1e5a1e246c43e8ad69fd5e0cb80ea176a226ef3db67922aa3e60a5d
-  data.tar.gz: 24e79b6a25942fb56e92a434bdba323eaf184a8ea13106a0e1c7f5a061942b3389ee2a8e7e97948d213f74bbb261746c0c88ec6c380d21fe1cd9a884bb466d27
+  metadata.gz: 43bcced09599301509cf6b5754cffda942fe35098dfab75a675be1bc1b5a1bdbb70d650c12055a2ad3ff668de7a55571db09c13329394f2248a1c322c13cc3fb
+  data.tar.gz: 3d1005b0fb44134cff7ffa413e2c7290a42616b89fde98811c91c54dab636cbf39f65ec3982fa1e0c583f937b573b18cf0741ae4131bce5e2947be8aa6433875

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/config/source_manager.rb

@@ -221,7 +221,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 +292,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.12.6"
 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

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.12.6
 platform: ruby
 authors:
 - humin