cocoapods-spm 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 976fa3a27b962fd5c4345604f1e8b237de4f276d55c1a41bc55958701485dffd
-  data.tar.gz: d2e952870615756fa20f3daafb0132ea1d598f1f7946286dc5ba0fc7a12e110c
+  metadata.gz: 764bb9ac7c4e7ca71bd30d1abdd9b617a026f921b9ab4c1ac0c87bc5cfbd67d1
+  data.tar.gz: 15990b7e1ee3e05ecd25af731acd06e13c1de72140291896fa38826213593c6e
 SHA512:
-  metadata.gz: b1927b7df6344e9b81d703935d2171846be6054b8960f56e80c070f61f38497e79e9ad94946df72b8597a741633bfc48636e1424ac5559cf46b12a0bf642def4
-  data.tar.gz: a31f607a2ddc0865a2b7245a1206bb299136c0dc63d4dbe81d361d55910b3193139aa440e8ddd5b42a3466621ef2df88bb4510beb885adf40e64d8bac3e8819b
+  metadata.gz: 9f39d170b78733247dfdcd69e12dba4c92b764c71e9ad290f8096310588e3d8ce0ca6b511a990f110a6c39154cc1e7c84210f4dcac8d5e2194a15b946def839e
+  data.tar.gz: 2059f70849d1b4eb10fec1fee649376115c0abcf004683fcafc41ff7d2094baa697ff8b5dfa72085836f35528392393d410a88bfba294c5e3bb89d31dfa98327

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

@@ -0,0 +1,28 @@
+module Pod
+  class Target
+    class NonLibrary
+      attr_reader :underlying, :spec
+
+      def initialize(underlying: nil, spec: nil)
+        @underlying = underlying
+        @spec = spec
+      end
+
+      def name
+        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

@@ -48,10 +48,11 @@ module Pod
           perform_settings_update(
             update_targets: lambda do |target, _, _|
               {
-                "SOURCE_PACKAGES_CHECKOUTS_DIR" => "${BUILD_ROOT}/../../SourcePackages/checkouts",
+                **derived_data_settings,
+                "SOURCE_PACKAGES_CHECKOUTS_DIR" => "${PROJECT_DERIVED_DATA_DIR}/SourcePackages/checkouts",
                 "FRAMEWORK_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}/PackageFrameworks\"",
                 "LIBRARY_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}\"",
-                "SWIFT_INCLUDE_PATHS" => "$(PODS_CONFIGURATION_BUILD_DIR)",
+                "SWIFT_INCLUDE_PATHS" => "${PODS_CONFIGURATION_BUILD_DIR}",
                 "OTHER_SWIFT_FLAGS" => modulemap_args_for_target(target, prefix: "-Xcc"),
                 "OTHER_CFLAGS" => modulemap_args_for_target(target),
                 "HEADER_SEARCH_PATHS" => header_search_paths_for(target),
@@ -61,8 +62,16 @@ module Pod
           )
         end
 
+        def derived_data_settings
+          {
+            "BUILD_ROOT_TO_DERIVED_DATA_SUFFIX_archive" => "/../../..",
+            "BUILD_ROOT_TO_DERIVED_DATA_SUFFIX_install" => "/../../..",
+            "PROJECT_DERIVED_DATA_DIR" => "${BUILD_ROOT}/../..${BUILD_ROOT_TO_DERIVED_DATA_SUFFIX_${ACTION}}",
+          }
+        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/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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-spm
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.16
 platform: ruby
 authors:
 - Thuyen Trinh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-02 00:00:00.000000000 Z
+date: 2025-06-22 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