cocoapods-spm 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4fe180c87aca4c93c0309f995109ef39507f5e5f82183a1e6e15d247e153a3b
-  data.tar.gz: 8f913beccd589a820ec92b4a5ef6af7c0373f3b878cd3e78eac18720e3383b8b
+  metadata.gz: bbcb911c20a1ba82d17dce1be6e78b74e4a1d8e2b32d60e38363ea67cbe4f8a8
+  data.tar.gz: 9b15453f318dec4cd6d54119e8245023a200befa673e490a35f59b6768015c40
 SHA512:
-  metadata.gz: '064788c5e4bbc60ebbcf3bb3f9334c8f30a75d1102c26181299978894e42554f9430adda3d1e7c8b17c9572f146e9a6fa3a0179f20db7be7cf1f95e9c31601b8'
-  data.tar.gz: 53adc8060fe965e1ef8566a8fbf1844ac9adbf3adddd93fcab6e52afd4750adb97273379247bbb3d13e5c5492622b2763c9b7e4682ee365cf96f706076ed7180
+  metadata.gz: 209616fc087b99e98a39356f06a458190ba59d5e9272355dcaa3caa0fd312557a159a0c7e2bd159ea1cd420aff8f1c206c124a328b6cd7b7be40c656343fff14
+  data.tar.gz: d7dd3483408ec69e18e4bebd8a8a7055ddd570f9ddd878e6e7b82d99c84914476a89e1a2cb05f29880904aa6823bbf074e83d8ccc52bbcd0eca3f5a0f6792978

data/lib/cocoapods-spm/def/installer.rb

@@ -0,0 +1,7 @@
+module Pod
+  class Installer
+    def native_targets
+      pods_project.targets + pod_target_subprojects.flat_map(&:targets)
+    end
+  end
+end

data/lib/cocoapods-spm/hooks/base.rb

@@ -30,6 +30,14 @@ module Pod
         @analysis_result.targets
       end
 
+      def pod_target_subprojects
+        @context.pod_target_subprojects
+      end
+
+      def projects_to_integrate
+        [pods_project] + pod_target_subprojects
+      end
+
       def user_build_configurations
         @user_build_configurations ||= (pod_targets + aggregate_targets)[0].user_build_configurations
       end

data/lib/cocoapods-spm/hooks/post_integrate/1.add_spm_pkgs.rb

@@ -8,37 +8,21 @@ module Pod
         def run
           return if @spm_resolver.result.spm_pkgs.empty?
 
-          add_spm_pkg_refs_to_project
-          add_spm_products_to_targets
-          pods_project.save
-        end
-
-        private
-
-        def spm_pkg_refs
-          @spm_pkg_refs ||= {}
-        end
-
-        def add_spm_pkg_refs_to_project
-          @spm_pkg_refs = @spm_resolver.result.spm_pkgs.to_h do |pkg|
-            pkg_ref = pkg.create_pkg_ref(pods_project)
-            pods_project.root_object.package_references << pkg_ref
-            [pkg.name, pkg_ref]
-          end
-        end
-
-        def spm_pkgs_by_target
-          @spm_pkgs_by_target ||= {}
-        end
-
-        def add_spm_products_to_targets
-          pods_project.targets.each do |target|
-            @spm_resolver.result.spm_dependencies_for(target).each do |dep|
-              pkg_ref = spm_pkg_refs[dep.pkg.name]
-              target_dep_ref = pkg_ref.create_target_dependency_ref(dep.product)
-              target.dependencies << target_dep_ref
-              target.package_product_dependencies << target_dep_ref.product_ref if dep.pkg.use_default_xcode_linking?
+          projects_to_integrate.compact.each do |project|
+            spm_pkg_refs = {}
+            project.targets.each do |target|
+              @spm_resolver.result.spm_dependencies_for(target).each do |dep|
+                pkg_ref = dep.pkg.create_pkg_ref(project)
+                target_dep_ref = pkg_ref.create_target_dependency_ref(dep.product)
+                target.dependencies << target_dep_ref
+                target.package_product_dependencies << target_dep_ref.product_ref if dep.pkg.use_default_xcode_linking?
+                spm_pkg_refs.store(dep.pkg.name, pkg_ref)
+              end
+            end
+            spm_pkg_refs.each_value do |pkg_ref|
+              project.root_object.package_references << pkg_ref
             end
+            project.save
           end
         end
       end

data/lib/cocoapods-spm/main.rb

@@ -3,6 +3,7 @@ require "cocoapods-spm/helpers/io"
 require "cocoapods-spm/helpers/patch"
 require "cocoapods-spm/config"
 require "cocoapods-spm/executables"
+require "cocoapods-spm/def/installer"
 require "cocoapods-spm/def/target_definition"
 require "cocoapods-spm/def/podfile"
 require "cocoapods-spm/def/spec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-spm
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Thuyen Trinh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-25 00:00:00.000000000 Z
+date: 2024-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -44,6 +44,7 @@ files:
 - lib/cocoapods-spm/config/pod.rb
 - lib/cocoapods-spm/config/project.rb
 - lib/cocoapods-spm/config/spm.rb
+- lib/cocoapods-spm/def/installer.rb
 - lib/cocoapods-spm/def/podfile.rb
 - lib/cocoapods-spm/def/spec.rb
 - lib/cocoapods-spm/def/spm_dependency.rb