cocoapods-bb-PodAssistant 0.3.11.1 → 0.3.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 971e70a6988e79249d00c1ceaab66100569a9813a5d55ccf3ffdb1d8f8fe2183
-  data.tar.gz: 40e38c5cf1f4118a5773530715163ffb8201d3868ba39a0cc6e58b9c28d16096
+  metadata.gz: f24cb36efee097e747c10f4f2d4f7746bc48711818b02c13db8748dde4b3eec6
+  data.tar.gz: 7a2c0fbc83879774f5bef6b4b4162ded38076953e378d76394c2f441dbc0a170
 SHA512:
-  metadata.gz: 222c1d098ca82d2a80ae4f2131a53a4be7643ae4281375ca4d1255090c2e881371a6a2d60f9a8ff69f58b9c2ff716e12a480d4843bcf5a53a75578c42b345dd2
-  data.tar.gz: 637405ffdf27673035be531c77715ecdd8e5c3792bb5b4985c360d3af3052679955add2661432df1719406459133aba45fde69ed363ec39471d3ed826b5ccb88
+  metadata.gz: 5b72cb59afd1d49622913c3b65040e93f93331f12a1f7c20c9b35cd8a88d182bdaa81c2507d752d8a76bd804c1d20f6bf64094a63b13470e934352d99f337cac
+  data.tar.gz: 7151e24ab59a31c0d631937257a9901d9c2a10736b093190eca261bbef24714ff7d23f197270133b0f650b7b292ac8873f608067e3aac6be0572f77ef6ae2a06

data/lib/cocoapods-bb-PodAssistant/babybus/helpers/babybus_info_plist_helper.rb

@@ -125,17 +125,22 @@ def isCityApp
     return bundleId === "com.sinyee.babybus.city"
 end
 
-# 是否创意世界产品
+# 是否创意世界产品(海外)
 def isGameWorldApp
     bundleId = getProjectBundleIdentifier()
     return bundleId === "com.sinyee.babybus.gameworld"
 end
+# 是否创意世界产品(国内)
+def isBingoworldApp
+    bundleId = getProjectBundleIdentifier()
+    return bundleId === "com.joltrix.bingoworld"
+end
 
 # 是否矩阵产品
 def isMatrixApp
     bundleId = getProjectBundleIdentifier()
     puts "###bundleId:#{bundleId}###".red
-    if (isHanZiApp || isQMWApp || isPinyinAppp || isCourseApp || isMathApp || isABCApp || isCityApp) then
+    if (isHanZiApp || isQMWApp || isPinyinAppp || isCourseApp || isMathApp || isABCApp || isCityApp || isGameWorldApp || isBingoworldApp) then
         return false
     end
     return true

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

@@ -5,6 +5,7 @@ require 'xcodeproj'
 require 'cocoapods-bb-PodAssistant/babybus/helpers/babybus_info_plist_helper'
 require 'cocoapods-bb-PodAssistant/babybus/business/babybus_install_environment'
 require 'cocoapods-bb-PodAssistant/helpers/pod_utils'
+require 'fileutils'
 
 class PodPostInstaller
     def initialize(lib, deployment_target=nil, filter_targets=["test"], is_matrix=true)
@@ -35,6 +36,67 @@ class PodPostInstaller
         return false
     end
 
+    # 修正Xcode16静态库不能po问题(打印swift参数、全局变量)
+    def fix_above_xcode16_no_po()
+        is_above_xcode16 = BB::PodUtils.above_xcode_16_version # 高于16
+        if (is_above_xcode16 == true) then
+            puts "� CocoaPods: Modifying OTHER_LDFLAGS for Xcode16+ LLDB debugging..."
+            @lib.aggregate_targets.each do |target|
+                xcconfig_path = File.join(@lib.sandbox.target_support_files_root.to_s, target.name, "#{target.name}.debug.xcconfig")
+            
+                # 确保 xcconfig 文件存在
+                next unless File.exist?(xcconfig_path)
+            
+                # 读取 xcconfig 内容
+                xcconfig_content = File.read(xcconfig_path)
+            
+                # 查找 EXISTING `OTHER_LDFLAGS`
+                match = xcconfig_content.match(/OTHER_LDFLAGS = ([^\n]+)\n/)
+                next unless match # 避免 nil 错误
+            
+                xcconfig_new_ld_flags = match[1] # 提取原来的 OTHER_LDFLAGS
+            
+                # 遍历所有 Pod 组件
+                target.pod_targets.each do |pod_target|
+                  if pod_target.build_as_static? 
+                    pod_target_name = pod_target.name
+                    swiftmodule_path = "$(TARGET_BUILD_DIR)/#{pod_target_name}/#{pod_target_name}.framework/Modules/#{pod_target_name}.swiftmodule/$(NATIVE_ARCH_ACTUAL)-apple-$(SHALLOW_BUNDLE_TRIPLE).swiftmodule"
+                    
+                    # 避免重复添加相同路径
+                    unless xcconfig_new_ld_flags.include?(swiftmodule_path)
+                      xcconfig_new_ld_flags += " -Wl,-add_ast_path,#{swiftmodule_path}"
+                    end
+                  end
+                end
+            
+                # 替换原有 OTHER_LDFLAGS
+                xcconfig_content.gsub!(/OTHER_LDFLAGS = ([^\n]+)\n/, "OTHER_LDFLAGS = #{xcconfig_new_ld_flags}\n")
+            
+                # 写回文件（确保不破坏原有格式）
+                FileUtils.cp(xcconfig_path, "#{xcconfig_path}.backup") # 备份原文件
+                File.write(xcconfig_path, xcconfig_content)
+            
+                puts "✅ 已添加 SwiftModule 路径到 xcconfig_path: #{xcconfig_path}"
+            end
+            # @lib.aggregate_targets.each do |target|
+            #     xcconfig_path = @lib.sandbox.target_support_files_root.to_s + "/#{target.name}/#{target.name}.debug.xcconfig"
+            #     xcconfig_content = File.read xcconfig_path
+            #     xcconfig_new_ld_flags = xcconfig_content.match(/OTHER_LDFLAGS = ([^\n]+)\n/)[1]
+            #     target.pod_targets.each do |pod_target|
+            #         if pod_target.build_as_static?
+            #             pod_targetName = pod_target.name
+            #             xcconfig_new_ld_flags += " -Wl,-add_ast_path,$(TARGET_BUILD_DIR)/#{pod_targetName}/#{pod_targetName}.framework/Modules/#{pod_targetName}.swiftmodule/$(NATIVE_ARCH_ACTUAL)-apple-$(SHALLOW_BUNDLE_TRIPLE).swiftmodule"
+            #         end
+            #     end
+            #     xcconfig_content.gsub! /OTHER_LDFLAGS = ([^\n]+)\n/, "OTHER_LDFLAGS =#{xcconfig_new_ld_flags}\n"
+            #     File.open(xcconfig_path, 'w') do |f|
+            #         f.puts xcconfig_content
+            #     end
+            #     puts "✅ 已添加 SwiftModule 路径到 xcconfig_path: #{xcconfig_path}"
+            # end
+        end
+    end
+
     def run
         env = BabybusInstallEnv.new()
         is_above_xcode15 = BB::PodUtils.compare_xcode_15_version # 高于15
@@ -151,5 +213,7 @@ class PodPostInstaller
                 project.save
             end
         end
+        # 修正Xcode16不能po问题
+        fix_above_xcode16_no_po()
     end
 end

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

@@ -1,3 +1,3 @@
 module CocoapodsBbPodassistant
-  VERSION = "0.3.11.1"
+  VERSION = "0.3.12.1"
 end

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

@@ -78,9 +78,9 @@ module BB
         #     File.rename "#{Dir.home}/.AllPodsTimeAndSize.csv", "#{installer.sandbox_root}/AllPodsTimeAndSize.csv"
         #     puts "具体的统计数据请在#{installer.sandbox_root}/AllPodsTimeAndSize.csv中查看"
         # end
-         # 获取时间差
-         time = $podEndTime - $podStartTime
-         puts "[PodAssistant] pod操作总耗时【#{time.to_s.send(:red)}秒】start:#{$podStartTime} end:#{$podEndTime}".green
+        # 获取时间差
+        time = $podEndTime - $podStartTime
+        puts "[PodAssistant] pod操作总耗时【#{time.to_s.send(:red)}秒】start:#{$podStartTime} end:#{$podEndTime}".green
     rescue => exception
       # 如果没有下载则#{Dir.home}/.AllPodsTimeAndSize.csv文件不会生成，产生异常
       puts "[PodAssistant] post_install error(已捕获): #{exception}".red

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-PodAssistant
 version: !ruby/object:Gem::Version
-  version: 0.3.11.1
+  version: 0.3.12.1
 platform: ruby
 authors:
 - humin
 bindir: bin
 cert_chain: []
-date: 2025-02-19 00:00:00.000000000 Z
+date: 2025-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -169,7 +169,6 @@ files:
 - lib/cocoapods-bb-PodAssistant/command/stable/update.rb
 - lib/cocoapods-bb-PodAssistant/config/cache_path.rb
 - lib/cocoapods-bb-PodAssistant/config/data_config.rb
-- lib/cocoapods-bb-PodAssistant/config/json_parser.rb
 - lib/cocoapods-bb-PodAssistant/config/source_manager.rb
 - lib/cocoapods-bb-PodAssistant/config/stable_source.rb
 - lib/cocoapods-bb-PodAssistant/config/stable_specs.rb
@@ -218,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.5
 specification_version: 4
 summary: A longer description of cocoapods-bb-PodAssistant.
 test_files: []

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

@@ -1,53 +0,0 @@
-require 'json'
-
-module BB
-    class JsonParser
-        attr_reader :json_data
-      
-        # 初始化，读取并解析 JSON 文件
-        def initialize(file_path)
-            @file_path = file_path
-            @json_data = read_json
-        end
-      
-        # 读取并解析 JSON 文件
-        def read_json
-            begin
-                file_content = File.read(@file_path)
-                JSON.parse(file_content)
-            rescue Errno::ENOENT
-                puts "错误：找不到文件 #{@file_path}"
-                nil
-            rescue JSON::ParserError
-                puts "错误：JSON 解析失败，请检查文件格式"
-                nil
-            end
-        end
-      
-        # 遍历 JSON 并返回 key-value 结构
-        def traverse_json(data = @json_data, prefix = "", result = {})
-            return result unless data
-
-            case data
-            when Hash
-            data.each do |key, value|
-                traverse_json(value, "#{prefix}#{key}.", result)
-            end
-            when Array
-            data.each_with_index do |value, index|
-                traverse_json(value, "#{prefix}[#{index}].", result)
-            end
-            else
-            result[prefix.chomp('.')] = data
-            end
-
-            result
-        end
-
-        # 提供给业务方的获取 JSON 数据方法
-        def get_json_data
-            return {} unless @json_data
-            traverse_json
-        end
-    end
-end