cocoapods-podgenerate 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a09245ceccdb3fe6baffa21e46a91047d662665a06b346f10d35d75827ca0b0
-  data.tar.gz: 2603e1fee43466df12136ebc901d89bb628df735bf54973a1986551caf96b1a9
+  metadata.gz: fcab1469dbb21e1af1ff2024d9ba7f7761719a51c5e55c3b2bef9d36bf5ac991
+  data.tar.gz: 2bba05f649c9e47cf55974b53d894428fcdd252d8ae456c638f563704bbd769f
 SHA512:
-  metadata.gz: ce1f86d080ddd862e6b94a0cc80fdff37a7bc3f5820c1241ff947fb819d0ce4d600b2af138b4b1de3c3024a7ffbebd270eef72f086052e70ea98ff82033a2510
-  data.tar.gz: 12a5c333eea428c31f8dfcca12a18bc548701708ac37f8c1e245ad3848cdfbf6fa789144b37bd7d5009e583a8d7041ffad4da4fe8792e8ae684af25c68c3d7a9
+  metadata.gz: 6d92ebe86345558f686219e98fcb9685c9955794d2dbdcc508832460966ff65b79203144c70738789499f2b9ab883ecea5f8f5eca051da40146892ad05587c36
+  data.tar.gz: efee76fa98a79f2088d641f0819bf659d4cae5182d31a5f7e7fa20af8a87c6dfb25c7d51750e27553e29b1956eab2590dd9a60c9a586152220108127273bbca5

data/lib/cocoapods-podgenerate/patches/analyzer_patch.rb

@@ -265,14 +265,14 @@ module Pod
                 end
               end
 
-            # 组装缓存数据
-            data = {
-              'cache_key' => cache_key,
-              'timestamp' => Time.now.to_s,
-              'cocoaPods_version' => Pod::VERSION,
-              'pod_count' => targets_data.values.flatten.size,
-              'targets' => targets_data,
-            }
+              # 组装缓存数据
+              data = {
+                'cache_key' => cache_key,
+                'timestamp' => Time.now.to_s,
+                'cocoaPods_version' => Pod::VERSION,
+                'pod_count' => targets_data.values.flatten.size,
+                'targets' => targets_data,
+              }
 
               # 原子写入：先写临时文件，成功后再 rename
               tmp_path = "#{path}.tmp"

data/lib/cocoapods-podgenerate/patches/installer_patch.rb

@@ -97,9 +97,12 @@ module Pod
               # C2 修复: 初始化所有实例变量（避免下游代码获得 nil）
               @generated_aggregate_targets = aggregate_targets
               @generated_pod_targets = []
-              @pods_project = nil
+              # 修复: 创建空项目替代 nil，避免 post-install hooks 中
+              # installer.pods_project 返回 nil 导致 .targets 等调用崩溃
+              # （例如 Flutter podhelper.rb 访问 pods_project.targets）
+              @pods_project = Pod::Project.new(sandbox.project_path)
               @pod_target_subprojects = []
-              @generated_projects = []
+              @generated_projects = [@pods_project]
 
               # C2 修复: 确保 post-install hooks 被调用
               run_podfile_post_install_hooks
@@ -160,6 +163,16 @@ module Pod
               projects_writer = Pod::Installer::Xcode::PodsProjectWriter.new(sandbox, generated_projects,
                                                              target_installation_results.pod_target_installation_results,
                                                              installation_options)
+
+              # 解析跨项目依赖：当 generate_multiple_pod_projects 启用后，
+              # 主项目的 aggregate target 通过 PBXContainerItemProxy 引用子项目的 pod target。
+              # Xcodeproj 无法解析这些跨项目引用，PBXTargetDependency#target 返回 nil。
+              # 这会导致递归遍历依赖链的工具（如 Flutter podhelper.rb 的
+              # depends_on_flutter）在访问 nil.target 时崩溃。
+              # 解决方法：在 post-install hooks 运行前，将子项目 target 的引用
+              # 直接挂载到主项目的 PBXTargetDependency.target 上。
+              resolve_cross_project_dependencies
+
               projects_writer.write! do
                 run_podfile_post_install_hooks
               end
@@ -184,15 +197,60 @@ module Pod
 
           private
 
-          # 并行配置所有项目的 scheme 文件
+          # 解析跨项目 target 依赖关系
+          #
+          # generate_multiple_pod_projects 启用时，每个 pod target 位于独立的
+          # .xcodeproj 子项目中。主项目（Pods.xcodeproj）中的 aggregate target
+          # 通过 PBXTargetDependency + PBXContainerItemProxy 引用子项目中的目标。
+          # Xcodeproj 在读取主项目时不会自动加载子项目，因此
+          # PBXTargetDependency#target 对于跨项目引用返回 nil。
+          #
+          # 在 post-install hooks 执行前，将子项目中实际的 target 对象关联到
+          # 主项目的 PBXTargetDependency.target 上，使得依赖链遍历可以正常工作。
+          # 这对于 Flutter podhelper.rb 的 depends_on_flutter 递归函数尤为重要。
+          def resolve_cross_project_dependencies
+            return unless @pods_project && @pod_target_subprojects
+            return if @pod_target_subprojects.empty?
+
+            # 构建 UUID → target 查找表（从所有子项目中）
+            remote_targets = {}
+            @pod_target_subprojects.each do |sub_project|
+              sub_project.targets.each do |target|
+                remote_targets[target.uuid] = target
+              end
+            end
+
+            return if remote_targets.empty?
+
+            resolved = 0
+            # 遍历主项目中所有 target 的依赖
+            @pods_project.targets.each do |target|
+              target.dependencies.each do |dependency|
+                # 已解析的（同一项目内）跳过
+                next if dependency.target
+                # 无 proxy 引用说明不是跨项目依赖，也跳过
+                next unless dependency.target_proxy
+
+                remote_uuid = dependency.target_proxy.remote_global_id_string
+                next unless remote_uuid
+
+                remote_target = remote_targets[remote_uuid]
+                next unless remote_target
+
+                dependency.target = remote_target
+                resolved += 1
+              end
+            end
+
+            return unless resolved > 0
+
+            Pod::UI.message "[cocoapods-podgenerate] Resolved #{resolved} cross-project target dependencies"
+          end
+
+          # ── 并行配置 scheme ──
           #
           # 每个 scheme 文件是独立的 .xcscheme，存储在不同 xcodeproj 的
           # xcuserdata 目录中。每个 project 完全独立 → 无锁并行。
-          #
-          # v0.1.4 修复 (L3): 使用 defined? 检查代替 rescue NameError
-          # rescue NameError 过于宽泛（捕获所有未定义常量/变量/方法错误），
-          # 可能吞掉与 Concurrent::FixedThreadPool 无关的错误。
-          # defined? 精确检查 Concurrent::FixedThreadPool 类定义是否存在。
           def parallel_configure_schemes(projects_by_pod_targets, generator, generation_result)
             pool_size = [[Etc.nprocessors - 1, 2].max, 16].min
             Pod::UI.message "- Configuring schemes across #{projects_by_pod_targets.size} projects (pool: #{pool_size})"

data/lib/cocoapods-podgenerate/patches/project_writer_patch.rb

@@ -141,9 +141,11 @@ module Pod
 
             if pool
               projects.each do |project|
-                pool.post { cleanup_single_project(project) }
-              rescue StandardError => e
-                Pod::UI.warn "[cocoapods-podgenerate] Cleanup error: #{e.message}"
+                pool.post do
+                  cleanup_single_project(project)
+                rescue StandardError => e
+                  Pod::UI.warn "[cocoapods-podgenerate] Cleanup error: #{e.message}"
+                end
               end
               pool.shutdown
               pool.wait_for_termination(Pod::PodGenerate::Parallel::ThreadPool::DEFAULT_TIMEOUT) || pool.kill
@@ -186,9 +188,9 @@ module Pod
               projects.each do |project|
                 pool.post do
                   recreate_schemes_for_project(project, library_product_types, results_by_native_target)
+                rescue StandardError => e
+                  Pod::UI.warn "[cocoapods-podgenerate] Scheme recreation error: #{e.message}"
                 end
-              rescue StandardError => e
-                Pod::UI.warn "[cocoapods-podgenerate] Scheme recreation error: #{e.message}"
               end
               pool.shutdown
               pool.wait_for_termination(Pod::PodGenerate::Parallel::ThreadPool::DEFAULT_TIMEOUT) || pool.kill

data/lib/cocoapods-podgenerate/patches/user_integrator_patch.rb

@@ -64,6 +64,8 @@ module Pod
               threads = groups.map do |project, integrators|
                 Thread.new do
                   integrators.each(&:integrate!)
+                rescue StandardError => e
+                  Pod::UI.warn "[cocoapods-podgenerate] Integrate error for #{project.path}: #{e.message}"
                 end
               end
               threads.each(&:join)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-podgenerate
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - PodGenerate Team