cocoapods-bb-PodAssistant 0.3.16.6 → 0.3.16.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c71a479972979e6dff025ccd85e2e6a5e54f8f0abfe20db298668d9d92dee79
-  data.tar.gz: 98f0f5ed2a3f799f91b4dfd90f97cacaad3fa893cefd72f07afc481659b17bb9
+  metadata.gz: a4088855ba536056a694f3df4343768b8b6613a1000014e5b1e86d11188e3200
+  data.tar.gz: df9e641a54b8eeb4181df5fec530c24e164245e053f96f4ca9cb6e02f937811b
 SHA512:
-  metadata.gz: aabf67192f711c6e527ac896a6a1b80316e5921c0a6e898be76bd2aa86cb92f2f13222d87cef786523ea774779d46d9d291ce0d6b66a6a992755757f830ba2d3
-  data.tar.gz: '059b5c58c91a3e3c33359255dfdc00457edeae00b5db868c703a40609861cd307c9aefae0b2cade97f14d1aeb0822e28313db237b04d621feff98de78f502903'
+  metadata.gz: 81e30f10794cb18fa92eeaf043dae86247e6d1421d600467aa249347869699af7603fdf6f6ff0f305c04f85b89e5b5c66eb0b9dc716456d8396b76acc82e1232
+  data.tar.gz: 8b095a352774edd065cfc2e6d40d17f004188a600da6ac97bb8991c075a6dc07c50dd6c9c489e61592502da3f729715ba0c515291265a62d2832a032c1cf0140

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

@@ -37,6 +37,13 @@ class PodPostInstaller
         end
         @is_matrix = is_matrix
         @is_replaceMinVersionForMultiTarget = is_replaceMinVersionForMultiTarget
+        # Unity是否支持Simulator，由业务方设置为1开启，默认关闭
+        @unity_simulator_supported = ENV['UNITY_SIMULATOR_SUPPORTED'] == '1'
+        if @unity_simulator_supported
+            puts "当前Unity SDK 支持 Simulator"
+        else
+            puts "当前Unity SDK 不支持 Simulator".yellow
+        end
     end
     private def filterTargetName(target_name)
         for name in @filter_targets
@@ -175,6 +182,25 @@ install_framework()
         # new_flags.uniq.join(' ') #xcode26就是有多个Xlinker，故不能去重
     end
 
+    private def fix_above_xcode27_excluded_archs(config)
+        key = 'EXCLUDED_ARCHS[sdk=iphonesimulator*]'
+        excluded_archs = config.build_settings[key]
+        return if excluded_archs.nil?
+        archs = excluded_archs.to_s.split.reject { |arch| arch == 'arm64' }
+        if archs.empty?
+            config.build_settings.delete(key)
+        else
+            config.build_settings[key] = archs.join(' ')
+        end
+    end
+
+    private def config_unity_simulator_supported(config)
+        definitions = config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] || ['$(inherited)']
+        definitions = [definitions] unless definitions.is_a?(Array)
+        definitions << 'BB_UNITY_SIMULATOR_SUPPORTED=1' unless definitions.include?('BB_UNITY_SIMULATOR_SUPPORTED=1')
+        config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = definitions
+    end
+
     def run
         env = BabybusInstallEnv.new()
         is_above_xcode27 = BB::PodUtils.above_xcode_27_version # 高于27
@@ -195,6 +221,7 @@ install_framework()
         project = Xcodeproj::Project.open(BB::PodUtils.getXcodeprojPath)
         should_save = false
         base_ldflags = generate_other_ldflags()
+        # 工程配置
         project.targets.each do |target|
             target.build_configurations.each do |config|
                 # if !target.name.include? 'test'
@@ -215,11 +242,13 @@ install_framework()
                     # 确保 inherited 在
                     origin_flags.unshift('$(inherited)') unless origin_flags.include?('$(inherited)')
                     linkmap_flag = '-Wl,-map,$(CONFIGURATION_BUILD_DIR)/$(PRODUCT_NAME)-LinkMap-$(CURRENT_VARIANT)-$(CURRENT_ARCH).txt'
-                    if config.name.include?('Debug')
-                      new_ldflags << linkmap_flag unless new_ldflags.include?(linkmap_flag)
-                    else
-                      new_ldflags.delete(linkmap_flag)
-                    end
+                    # if config.name.include?('Debug')
+                    #   new_ldflags << linkmap_flag unless new_ldflags.include?(linkmap_flag)
+                    # else
+                    #   new_ldflags.delete(linkmap_flag)
+                    # end
+                    new_ldflags.delete(linkmap_flag) # 提升效率
+
                     # puts "====#{target.name}-#{config.name} beigin====="
                     # puts "origin_flags:#{origin_flags}"
                     # puts "new_ldflags:#{new_ldflags}"
@@ -231,6 +260,7 @@ install_framework()
                     else
                         puts "[Skipped] #{target.name} #{config.name}: already up-to-date"
                     end
+
                     # 配置工程最低部署：
                     # 1. 多 Target 产品显式开启替换时继续保持原有行为；
                     # 2. Xcode 27+ 强制将工程最低支持版本统一为 ios_deployment_target。
@@ -243,17 +273,10 @@ install_framework()
                             puts "#{target.name}-#{config.name} Build Setting 'IPHONEOS_DEPLOYMENT_TARGET' deployment target: #{origin_value} => #{new_value}"
                         end
                     end
+
                     # Xcode27去除EXCLUDED_ARCHS[sdk=iphonesimulator*] = arm64
                     if (is_above_xcode27 == true) then
-                        key = 'EXCLUDED_ARCHS[sdk=iphonesimulator*]'
-                        excluded_archs = config.build_settings[key]
-                        next if excluded_archs.nil?
-                        archs = excluded_archs.to_s.split.reject { |arch| arch == 'arm64' }
-                        if archs.empty?
-                            config.build_settings.delete(key)
-                        else
-                            config.build_settings[key] = archs.join(' ')
-                        end
+                        fix_above_xcode27_excluded_archs(config)
                     end
                 end
             end
@@ -265,7 +288,7 @@ install_framework()
                 config.build_settings['ARCHS'] = "$(ARCHS_STANDARD)"
             end
         end
-        # project.targets.config
+        # 组件配置
         @lib.pod_target_subprojects.flat_map { |p| p.targets }.each do |target|
             target.build_configurations.each do |config|
                 # pod 1.13.0兼容故去除，避免
@@ -316,18 +339,17 @@ install_framework()
                 else
                     config.build_settings['SWIFT_ACTIVE_COMPILATION_CONDITIONS'] = "$(inherited)"
                 end
+
+                # Unity 支持模拟器时，为 BBGameModule 注入编译宏，供 Objective-C/C/C++ 代码判断
+                if (target.name == 'BBGameModule') && (@unity_simulator_supported) then
+                    config_unity_simulator_supported(config)
+                end
+                
                 # Xcode27去除EXCLUDED_ARCHS[sdk=iphonesimulator*] = arm64
                 if (is_above_xcode27 == true) then
-                    key = 'EXCLUDED_ARCHS[sdk=iphonesimulator*]'
-                    excluded_archs = config.build_settings[key]
-                    next if excluded_archs.nil?
-                    archs = excluded_archs.to_s.split.reject { |arch| arch == 'arm64' }
-                    if archs.empty?
-                        config.build_settings.delete(key)
-                    else
-                        config.build_settings[key] = archs.join(' ')
-                    end
+                    fix_above_xcode27_excluded_archs(config)
                 end
+                
             end
             # 修复警告 Run script build phase '[CP] Copy Pods Resources' will be run during every build because it does not specify any outputs
             fix_phases = target.shell_script_build_phases.find { |x| x.name == '[CP] Copy XCFrameworks' || 'Create Symlinks to Header Folders' }
@@ -337,6 +359,6 @@ install_framework()
         end
         project.save if should_save
         # 修正Xcode16不能po问题
-        fix_above_xcode16_no_po()
+        # fix_above_xcode16_no_po() # xcode27不需要
     end
 end

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

@@ -43,6 +43,15 @@ class PodPostIntegrate
             []
         end
 
+        unity_simulator_supported = ENV['UNITY_SIMULATOR_SUPPORTED'] == '1'
+        # 业务方传入列表中：
+        # 1. cocos2dx.framework 始终排除，避免被当成 Simulator 不支持库处理
+        # 2. Unity 支持 Simulator 时，UnityFramework.framework 也排除
+        binaries = binaries.reject do |binary|
+            binary_name = File.basename(binary.to_s.strip)
+            binary_name == 'cocos2dx.framework' ||
+                (unity_simulator_supported && binary_name == 'UnityFramework.framework')
+        end
         # 默认不支持 Simulator 的二进制 + 外部传入的不支持二进制，过滤空值后统一去重。
         @simulator_unsupported_binaries = (
             DEFAULT_SIMULATOR_UNSUPPORTED_BINARIES + binaries

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

@@ -1,3 +1,3 @@
 module CocoapodsBbPodassistant
-  VERSION = "0.3.16.6"
+  VERSION = "0.3.16.8"
 end

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

@@ -231,7 +231,7 @@ module BB
                             end
                             if (branch && !branch.empty?) || (git && !git.empty?)
                                 # 项目配置指向分支数据，以本项目为主
-                                puts "[PodAssistant] #{podName} 指向分支数据 => #{podfile_pod}"
+                                # puts "[PodAssistant] #{podName} 指向分支数据 => #{podfile_pod}"
                                 stable_hash[podCoreName] = podfile_pod
                                 if podName != podCoreName
                                     need_update_pod_data[podName] = podfile_pod

metadata

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