cocoapods-spm 0.1.15 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4c8cfc44221acd450d4ab322792cc89a99fc46fcaeeaa750ed98ec23945ab4e
-  data.tar.gz: 9006ca077f16980c9c738b8dfa40ba1624b1ca387e7049fb9fa3b0db8aa99f13
+  metadata.gz: 5e5a6cf17e12dd330650a3b88c3f6dd22c3ee90abbcd60dc5fe07f7b1b1af6d6
+  data.tar.gz: c25bea8626a41f11b1e4761241a9499d232b4b775d30c34bc67e994785f4cd3d
 SHA512:
-  metadata.gz: 0e0a9bb08bb34ad8367597401aad718243fdac370601850fde8e3bb46ad5ca502a42bfb56558c6623c0b189c008bd1641462d84a9ef82b78b60044c47e736dab
-  data.tar.gz: ba9bb4b5e0a8a90f903924ec938fa69b96feca40b59c3658563290061dbe8ecd7b738559b48396e56174ce2bca69261be78eb568cc36de21625146b9d2af9954
+  metadata.gz: cafde5a272c7bbd41bd3c408ac7cd702fdf6fbbd176ac824ed43de26207e0c0c6ea176fd210b88d6eb1f7d6fc6f8e26b12b75a148ae1a0e40066d0153e311d09
+  data.tar.gz: 3d92b37b08762a510e1b115db7e309a070258dfaa3b83eb3743f7653bcc88ad66a0d86010eed4f320490dcdceff0bf5942744db0f6ac1b1f09ea0e2500148bd3

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

@@ -0,0 +1,32 @@
+module Pod
+  class Target
+    class NonLibrary
+      attr_reader :underlying, :spec
+
+      def initialize(underlying: nil, spec: nil)
+        @underlying = underlying
+        @spec = spec
+      end
+
+      def name
+        if underlying.is_a?(Xcodeproj::Project::Object::PBXNativeTarget) && underlying.test_target_type?
+          return underlying.name.sub(/-(Unit|UI)-/, "/")
+        end
+
+        spec.name
+      end
+
+      def platform
+        underlying.platform
+      end
+
+      def xcconfig_path(variant)
+        # For test spec, return the path as <TargetName>.unit-test.<Config>.xcconfig
+        # Here, we're trying to get `unit-tests` out of the spec, then calling
+        # `underlying.xcconfig_path("unit-tests.debug")` to get the result
+        variant_prefix = underlying.spec_label(spec).sub("#{underlying.name}-", "")
+        underlying.xcconfig_path("#{variant_prefix}.#{variant}")
+      end
+    end
+  end
+end

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

@@ -82,6 +82,15 @@ module Pod
             proc.call(update_targets, target, setting, config)
             proc.call(update_pod_targets, target, setting, config)
           end
+          next unless target.is_a?(PodTarget)
+
+          (target.test_specs + target.app_specs).each do |spec|
+            target_wrapper = Target::NonLibrary.new(underlying: target, spec: spec)
+            target.build_settings.each_key do |config|
+              setting = target.build_settings_for_spec(spec, :configuration => config)
+              proc.call(update_targets, target_wrapper, setting, config)
+            end
+          end
         end
 
         aggregate_targets.each do |target|

data/lib/cocoapods-spm/hooks/post_integrate/05.update_settings.rb

@@ -71,7 +71,7 @@ module Pod
         end
 
         def linker_flags_for(target)
-          return [] if !target.is_a?(Pod::AggregateTarget) && target.build_as_static?
+          return [] if target.is_a?(Pod::PodTarget) && target.build_as_static?
 
           @spm_resolver.result.linker_flags_for(target)
         end

data/lib/cocoapods-spm/main.rb

@@ -8,6 +8,7 @@ require "cocoapods-spm/def/installer"
 require "cocoapods-spm/def/target_definition"
 require "cocoapods-spm/def/podfile"
 require "cocoapods-spm/def/spec"
+require "cocoapods-spm/def/target"
 require "cocoapods-spm/patch/aggregate_target"
 require "cocoapods-spm/patch/installer"
 require "cocoapods-spm/command/spm"

data/lib/cocoapods-spm/resolver/result.rb

@@ -31,6 +31,9 @@ module Pod
         end
 
         def spm_dependencies_for(target)
+          if target.is_a?(Xcodeproj::Project::Object::PBXNativeTarget) && target.test_target_type?
+            target = Target::NonLibrary.new(underlying: target)
+          end
           filtered_dependencies = @spm_dependencies_by_target[spec_name_of(target)]&.reject do |dep|
             dep.pkg&.should_exclude_from_target?(target.name)
           end

data/lib/cocoapods-spm/resolver/target_dep_resolver.rb

@@ -28,7 +28,9 @@ module Pod
         def resolve_dependencies_for_targets
           specs = @aggregate_targets.flat_map(&:specs).uniq
           specs.each do |spec|
-            @result.spm_dependencies_by_target[spec.name] = spec.spm_dependencies
+            deps = spec.spm_dependencies
+            deps += spec.root.spm_dependencies if spec.subspec?
+            @result.spm_dependencies_by_target[spec.name] = deps.uniq
           end
         end
 

data/lib/cocoapods-spm/resolver/validator.rb

@@ -4,15 +4,30 @@ module Pod
       def initialize(aggregate_targets, result)
         @aggregate_targets = aggregate_targets
         @spm_pkgs = result.spm_pkgs
+        @project_pkgs = result.project_pkgs
         @spm_dependencies_by_target = result.spm_dependencies_by_target
       end
 
       def validate!
         verify_no_missing_pkgs
+        verify_products_exist
       end
 
       private
 
+      def verify_products_exist
+        @spm_dependencies_by_target.values.flatten.uniq.each do |d|
+          products = @project_pkgs.pkg_desc_of(d.pkg.name).products.map(&:name)
+          next if products.include?(d.product)
+
+          raise Informative, <<~DESC
+            There was an invalid dependency in Podfile or podspecs.
+            Package `#{d.pkg.name}` does not contain product `#{d.product}`.
+            Available products: #{products}
+          DESC
+        end
+      end
+
       def dependents_of_pkg(name)
         @specs ||= @aggregate_targets.flat_map(&:specs).uniq
         @specs.select { |s| s.spm_dependencies.any? { |d| d.name == name } }.map(&:name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-spm
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.17
 platform: ruby
 authors:
 - Thuyen Trinh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-16 00:00:00.000000000 Z
+date: 2025-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -49,6 +49,7 @@ files:
 - lib/cocoapods-spm/def/spec.rb
 - lib/cocoapods-spm/def/spm_dependency.rb
 - lib/cocoapods-spm/def/spm_package.rb
+- lib/cocoapods-spm/def/target.rb
 - lib/cocoapods-spm/def/target_definition.rb
 - lib/cocoapods-spm/def/xcodeproj.rb
 - lib/cocoapods-spm/executables.rb