cocoapods-spm 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 815b5b5db4530e4fd685d421cd33fb1cde41b29abfa667aa0ba9d3c1b61f8ef0
-  data.tar.gz: 6befd92a1d7528b4da4a5f62a1f8676c8bfb8be0dd5cc65d8c134a7df01d5b01
+  metadata.gz: e1e1e2bd492fb8080c1d1d0ab60b4abe580d3540559ba11085b0b2a93826de54
+  data.tar.gz: 1a30fc92b2e7cdc5082f6fea26635f55345a9ae08d835450e66041028b862036
 SHA512:
-  metadata.gz: abf5bf865306d931a1fbe53d230d17d80f62a1813a96b199c902c9f7da9dfc7ecbfff44eac5a3c7043ca73f856d66225c94f38d6ca5cf634f3b475d29f4a5476
-  data.tar.gz: 87e9e3935e947420740e3bdbd2d4c8ca0f36c8ad955a9ab15b2d7756c6bf58dc37aa7a3b9378df75b4db60b30c2e1e1a8b666b19d547cbe5216c907a0f89607a
+  metadata.gz: f7941760c3ec1e4be209ba35108e80db527218f6862f1fd4ffa87cbfde60688bd9e1aa735193f2018abd77593d0e8c47bfe652a60c577391a758cff7b47c8ccb
+  data.tar.gz: 21df8075d35796d309ed868cbfe7f07b53c57c325c3e3a298b7eabab3239d658805a54d291ed6f9fdf3bc06605210940f55f636c6e362e1932e828e72ad77985

data/lib/cocoapods-spm/compatibility/all.rb

@@ -0,0 +1 @@
+require_relative "rb26"

data/lib/cocoapods-spm/compatibility/rb26.rb

@@ -0,0 +1,14 @@
+module Enumerable
+  unless method_defined?(:filter_map)
+    def filter_map
+      return enum_for(:filter_map) unless block_given?
+
+      result = []
+      each do |element|
+        value = yield(element)
+        result << value if value
+      end
+      result
+    end
+  end
+end

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

@@ -49,6 +49,10 @@ module Pod
       end
     end
 
+    def platforms
+      @platforms ||= target_definition_list.filter_map { |d| d.platform&.name }.uniq || [:ios]
+    end
+
     private
 
     def prepare_macro_pod_dir(name, requirement)

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

@@ -55,6 +55,10 @@ module Pod
         @linking_opts.fetch(:use_default_xcode_linking, false)
       end
 
+      def should_exclude_from_target?(target_name)
+        @linking_opts.fetch(:exclude_from_targets, []).include?(target_name.delete_prefix('Pods-'))
+      end
+
       def linker_flags
         @linking_opts[:linker_flags] || []
       end

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

@@ -33,7 +33,7 @@ module Pod
 
         def add_spm_products_to_targets
           pods_project.targets.each do |target|
-            @spm_resolver.result.spm_dependencies_by_target[target.name].to_a.each do |dep|
+            @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

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

@@ -47,7 +47,7 @@ module Pod
           perform_settings_update(
             update_targets: lambda do |target, _, _|
               {
-                "SOURCE_PACKAGES_CHECKOUTS_DIR" => "${PODS_CONFIGURATION_BUILD_DIR}/../../../SourcePackages/checkouts",
+                "SOURCE_PACKAGES_CHECKOUTS_DIR" => "${BUILD_ROOT}/../../SourcePackages/checkouts",
                 "FRAMEWORK_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}/PackageFrameworks\"",
                 "LIBRARY_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}\"",
                 "SWIFT_INCLUDE_PATHS" => "$(PODS_CONFIGURATION_BUILD_DIR)",

data/lib/cocoapods-spm/main.rb

@@ -1,3 +1,4 @@
+require "cocoapods-spm/compatibility/all"
 require "cocoapods-spm/helpers/io"
 require "cocoapods-spm/helpers/patch"
 require "cocoapods-spm/config"

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

@@ -28,7 +28,9 @@ module Pod
           @result.spm_dependencies_by_target.values.flatten.uniq(&:product).each do |dep|
             next if dep.pkg.use_default_xcode_linking?
 
-            project_pkgs.resolve_recursive_targets_of(dep.pkg.name, dep.product)
+            @podfile.platforms.each do |platform|
+              project_pkgs.resolve_recursive_targets_of(dep.pkg.name, dep.product, platform: platform)
+            end
           end
         end
       end

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

@@ -31,12 +31,15 @@ module Pod
         end
 
         def spm_dependencies_for(target)
-          @spm_dependencies_by_target[target.to_s].to_a
+          filtered_dependencies = @spm_dependencies_by_target[spec_name_of(target)]&.reject do |dep|
+            dep.pkg&.should_exclude_from_target?(target.name)
+          end
+          filtered_dependencies.to_a
         end
 
         def spm_targets_for(target, exclude_default_xcode_linking: true)
           targets = spm_dependencies_for(target).flat_map do |d|
-            project_pkgs.resolve_recursive_targets_of(d.pkg.name, d.product)
+            project_pkgs.resolve_recursive_targets_of(d.pkg.name, d.product, platform: target.platform.name)
           end.uniq(&:name)
           return targets.reject(&:use_default_xcode_linking?) if exclude_default_xcode_linking
 
@@ -49,6 +52,21 @@ module Pod
             spm_pkgs_for(target).flat_map(&:linker_flags)
           ).uniq
         end
+
+        private
+
+        def spec_name_of(target)
+          # In case of multi-platforms, the target name might contains the platform (ex. Logger-iOS, Logger-macOS)
+          # We need to strip the platform suffix out
+          return target.name if @spm_dependencies_by_target.key?(target.name)
+          return target.root_spec.name if target.is_a?(Pod::PodTarget)
+          return target.name if target.is_a?(Pod::AggregateTarget)
+
+          cmps = target.name.split("-")
+          return cmps[...-1].join("-") if ["iOS", "macOS", "watchOS", "tvOS"].include?(cmps[-1])
+
+          target.name
+        end
       end
     end
   end

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

@@ -16,7 +16,7 @@ module Pod
         private
 
         def resolve_spm_pkgs
-          @result.spm_pkgs = @podfile.target_definition_list.flat_map(&:spm_pkgs).uniq
+          @result.spm_pkgs = @podfile.target_definition_list.flat_map(&:spm_pkgs).uniq(&:name)
         end
 
         def resolve_spm_dependencies_by_target

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

@@ -5,7 +5,7 @@ module Pod
 
       def initialize(podfile)
         @podfile = podfile
-        @spm_pkgs = @podfile.target_definition_list.flat_map(&:spm_pkgs).uniq
+        @spm_pkgs = @podfile.target_definition_list.flat_map(&:spm_pkgs).uniq(&:name)
       end
 
       def prepare

data/lib/cocoapods-spm/swift/package/project_packages.rb

@@ -12,9 +12,10 @@ module Pod
         load
       end
 
-      def resolve_recursive_targets_of(pkg_name, product_name)
+      def resolve_recursive_targets_of(pkg_name, product_name, platform: nil)
         @recursive_targets_cache ||= {}
-        return @recursive_targets_cache[product_name] if @recursive_targets_cache.key(product_name)
+        @recursive_targets_cache[platform] ||= {}
+        return @recursive_targets_cache[platform][product_name] if @recursive_targets_cache[platform].key(product_name)
 
         res = []
         to_visit = pkg_desc_of(pkg_name).targets_of_product(product_name)
@@ -23,9 +24,9 @@ module Pod
           res << target
           # Exclude macros as they wont be linked to the project's binary
           # https://github.com/trinhngocthuyen/cocoapods-spm/issues/107
-          to_visit += target.resolve_dependencies(@pkg_desc_cache).reject(&:macro?)
+          to_visit += target.resolve_dependencies(@pkg_desc_cache, platform: platform).reject(&:macro?)
         end
-        @recursive_targets_cache[product_name] = res.uniq(&:name)
+        @recursive_targets_cache[platform][product_name] = res.uniq(&:name)
       end
 
       def pkg_desc_of(name)

data/lib/cocoapods-spm/swift/package/target.rb

@@ -102,12 +102,13 @@ module Pod
           end
         end
 
-        def resolve_dependencies(pkg_desc_cache)
+        def resolve_dependencies(pkg_desc_cache, platform: nil)
           raw.fetch("dependencies", []).flat_map do |hash|
             type = ["byName", "target", "product"].find { |k| hash.key?(k) }
             if type.nil?
               raise Informative, "Unexpected dependency type. Must be either `byName`, `target`, or `product`."
             end
+            next [] unless match_platform?(hash[type][-1], platform)
 
             name = hash[type][0]
             pkg_name = hash.key?("product") ? hash["product"][1] : self.pkg_name
@@ -148,6 +149,17 @@ module Pod
         def use_default_xcode_linking?
           root.use_default_xcode_linking?
         end
+
+        private
+
+        def match_platform?(condition, platform)
+          # Consider matching if there's no condition
+          return true if condition.nil? || !condition.key?("platformNames")
+
+          # macos is called osx in Cocoapods.
+          platform_name = platform.to_s == 'osx' ? 'macos' : platform.to_s
+          condition["platformNames"].include?(platform_name)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-spm
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Thuyen Trinh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-31 00:00:00.000000000 Z
+date: 2024-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -38,6 +38,8 @@ files:
 - lib/cocoapods-spm/command/macro/fetch.rb
 - lib/cocoapods-spm/command/macro/prebuild.rb
 - lib/cocoapods-spm/command/spm.rb
+- lib/cocoapods-spm/compatibility/all.rb
+- lib/cocoapods-spm/compatibility/rb26.rb
 - lib/cocoapods-spm/config.rb
 - lib/cocoapods-spm/config/pod.rb
 - lib/cocoapods-spm/config/project.rb