cocoapods-podgenerate 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcab1469dbb21e1af1ff2024d9ba7f7761719a51c5e55c3b2bef9d36bf5ac991
-  data.tar.gz: 2bba05f649c9e47cf55974b53d894428fcdd252d8ae456c638f563704bbd769f
+  metadata.gz: fa4cebf776d8e9316d7918a7556d5458e21b3e0cbea9e8f721093a056227fba9
+  data.tar.gz: 280babae205a25f7cd82993b36fa5f4d74514370df1d3292e1aa846c9c14f701
 SHA512:
-  metadata.gz: 6d92ebe86345558f686219e98fcb9685c9955794d2dbdcc508832460966ff65b79203144c70738789499f2b9ab883ecea5f8f5eca051da40146892ad05587c36
-  data.tar.gz: efee76fa98a79f2088d641f0819bf659d4cae5182d31a5f7e7fa20af8a87c6dfb25c7d51750e27553e29b1956eab2590dd9a60c9a586152220108127273bbca5
+  metadata.gz: 5a3e01afe52be0424971e8bf07400de9e3d836c56d78db0ca9142f4a4e09d7946b82978a4fe1babb6ca61d3733b4c7a69c01259ea812f948755fefaa010cb193
+  data.tar.gz: 0714d4f01940a0dbd5a5036573dc324eec254f2f139c8da6739a28c16bae62b5d0cf6a3ec9c93004fdf9537c74c391931d56e5ca5f41759b88ded729a62498e7

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

@@ -208,37 +208,46 @@ module Pod
           # 在 post-install hooks 执行前，将子项目中实际的 target 对象关联到
           # 主项目的 PBXTargetDependency.target 上，使得依赖链遍历可以正常工作。
           # 这对于 Flutter podhelper.rb 的 depends_on_flutter 递归函数尤为重要。
+          #
+          # v0.1.9 改进：同时解析子项目 target 的跨项目依赖
+          # 因为 post-install hooks 可能遍历所有 generated_projects 的 targets，
+          # 不仅限于主项目（如 Flutter 新版 podhelper.rb 遍历所有子项目）。
           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
+            return unless @generated_projects && !@generated_projects.empty?
+            Pod::UI.message "[cocoapods-podgenerate] Resolving cross-project deps across #{@generated_projects.size} projects"
+
+            # 构建全局 UUID → target 查找表（来自所有项目，包括主项目）
+            all_targets = {}
+            @generated_projects.each do |project|
+              project.targets.each do |target|
+                all_targets[target.uuid] = target
               end
             end
 
-            return if remote_targets.empty?
+            if all_targets.empty?
+              Pod::UI.message '[cocoapods-podgenerate] No targets found in generated_projects — skipping cross-project resolution'
+              return
+            end
 
             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
+            # 遍历所有项目（主项目 + 子项目），解析它们的跨项目依赖
+            @generated_projects.each do |project|
+              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 = all_targets[remote_uuid]
+                  next unless remote_target
+
+                  dependency.target = remote_target
+                  resolved += 1
+                end
               end
             end
 

metadata

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