cocoapods-spm 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b9b83e3ac7c7282f49cce528a02e34e2fed09ca2223678d1163e19cc207622d
-  data.tar.gz: 5f53852020f6c43d8f30b779b5d368c5e12947879dce8bd36ebc957432b0a526
+  metadata.gz: e61ad227d509165fab0c8f3e832aa06d05524fa7c2cbfd4d7cc8f393252fc60f
+  data.tar.gz: 66f6bf9e254c7a99edc55f304fcf34ea60867fbbb9f138a6473eb200b6fa9f32
 SHA512:
-  metadata.gz: e4ded83745f975f6c72c5e1661f819f402b29a86265afdb7769b3109e9ea457bd4305fcb022af68240b1181860027ca16f5c659616b5ce550f0277b338ff00f7
-  data.tar.gz: ace85ea8679705143e58c81f0c0f4d1831a2848939f083031baff3469fb41a982172c41a7caca23a3368f3afb1ef11302ced2445497afceb35c0e35c8fcf8d12
+  metadata.gz: e48c19f9a2ed81601a69cca75ceda44b9353bf76f996458dc3398dad8e7b0ed2fa6fff8ce03cad91122cdcf6f7603a5cc1070b9944dfab98a0d1ff5081f82740
+  data.tar.gz: d26d1674591412b761b92e51154142b5e76f7515464b0e462d5b26a06caeadd3162df96308d2ff34b1cb3d27c554eb33715d2248b7e66e2e58e1d56ceb4b1214

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

@@ -33,10 +33,14 @@ module Pod
 
     def spm_pkgs_by_aggregate_target
       @spm_pkgs_by_aggregate_target ||= begin
-        common_spm_pkgs = root_target_definitions.flat_map(&:spm_pkgs)
-        target_definition_list.reject(&:abstract?).to_h do |target|
-          [target.to_s, (common_spm_pkgs + target.spm_pkgs).uniq(&:name)]
+        dict = {}
+        to_visit = root_target_definitions.map { |t| [t, []] }
+        until to_visit.empty?
+          target, acc = to_visit.pop
+          dict[target.to_s] = (target.spm_pkgs + acc).uniq
+          to_visit += target.children.map { |t| [t, dict[target.to_s]] }
         end
+        dict
       end
     end
 

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

@@ -4,7 +4,7 @@ require "cocoapods-spm/def/spm_dependency"
 module Pod
   module SPM
     class Package
-      attr_reader :name, :requirement, :url, :relative_path
+      attr_reader :name, :requirement, :url, :relative_path, :linking_opts
 
       def initialize(name, options = {})
         @name = name
@@ -13,6 +13,7 @@ module Pod
         @linkage = nil
         @url = nil
         @requirement = nil
+        @linking_opts = {}
         parse_options(options)
       end
 
@@ -20,6 +21,7 @@ module Pod
         @url = options[:url] || options[:git]
         @relative_path = relative_path_from(options)
         @requirement = requirement_from(options)
+        @linking_opts = options[:linking] || {}
       end
 
       def slug
@@ -47,6 +49,14 @@ module Pod
         @relative_path != nil
       end
 
+      def use_default_xcode_linking?
+        @linking_opts.fetch(:use_default_xcode_linking, false)
+      end
+
+      def linker_flags
+        @linking_opts[:linker_flags] || []
+      end
+
       def to_dependencies
         if (products = @_options[:products])
           products.map { |product| Dependency.new(@name, product: product, pkg: self) }

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

@@ -37,6 +37,7 @@ module Pod
               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?
             end
           end
         end

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

@@ -71,9 +71,7 @@ module Pod
         def linker_flags_for(target)
           return [] if !target.is_a?(Pod::AggregateTarget) && target.build_as_static?
 
-          @spm_resolver.result.spm_products_for(target).map do |p|
-            p.dynamic? ? "-framework \"#{p.name}\"" : "-l\"#{p.name}.o\""
-          end
+          @spm_resolver.result.linker_flags_for(target)
         end
 
         def update_swift_include_paths

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

@@ -2,13 +2,16 @@ module Pod
   module SPM
     class Resolver
       class Product
-        attr_reader :pkg, :name, :linkage, :headers_path
+        attr_reader :pkg, :name, :linkage, :headers_path, :binary
+
+        alias binary? binary
 
         def initialize(options = {})
           @pkg = options[:pkg]
           @name = options[:name]
           @linkage = options.fetch(:linkage, :static)
           @headers_path = options[:headers_path]
+          @binary = options[:binary]
         end
 
         def inspect
@@ -18,6 +21,10 @@ module Pod
         def dynamic?
           @linkage == :dynamic
         end
+
+        def linked_as_framework?
+          dynamic? || binary?
+        end
       end
     end
   end

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

@@ -14,6 +14,7 @@ module Pod
         def resolve
           generate_metadata
           resolve_dynamic_products
+          resolve_binary_targets
           resolve_headers_path_by_target
           resolve_product_deps
         end
@@ -48,6 +49,15 @@ module Pod
           end
         end
 
+        def resolve_binary_targets
+          @binary_targets ||= Set.new
+          @result.metadata_cache.each_value do |metadata|
+            metadata.targets.each do |h|
+              @binary_targets << h["name"] if h["type"] == "binary"
+            end
+          end
+        end
+
         def resolve_headers_path_by_target
           @headers_path_by_product ||= {}
           @result.metadata_cache.each_value do |metadata|
@@ -62,7 +72,9 @@ module Pod
         end
 
         def resolve_product_deps
-          @result.spm_dependencies_by_target.values.flatten.uniq(&:name).each do |dep|
+          @result.spm_dependencies_by_target.values.flatten.uniq(&:product).each do |dep|
+            next if dep.pkg.use_default_xcode_linking?
+
             verify_product_exists_in_pkg(dep.pkg.name, dep.product)
             product = create_product(dep.pkg.name, dep.product)
             recursive_products_of(product)
@@ -78,7 +90,7 @@ module Pod
         def recursive_products_of(product)
           products = [product] + direct_products_of(product).flat_map do |child|
             [child] + recursive_products_of(child)
-          end
+          end.uniq(&:name)
           @result.spm_products[product.name] = products
           products
         end
@@ -100,14 +112,10 @@ module Pod
         end
 
         def product_from_hash(hash, metadata)
-          if hash.key?("byName")
-            name = hash["byName"][0]
-            pkg = metadata["name"]
-          elsif hash.key?("product")
-            name, pkg = hash["product"]
-          elsif hash.key?("target")
-            # TODO: Handle this
-          end
+          type = ["byName", "target", "product"].find { |k| hash.key?(k) }
+          name = hash[type][0] unless type.nil?
+          pkg = metadata["name"]
+          pkg = hash["product"][1] if hash.key?("product")
           create_product(pkg, name)
         end
 
@@ -116,7 +124,8 @@ module Pod
             pkg: pkg,
             name: name,
             linkage: @dynamic_products.include?(name) ? :dynamic : :static,
-            headers_path: @headers_path_by_product[name]
+            headers_path: @headers_path_by_product[name],
+            binary: @binary_targets.include?(name)
           )
         end
       end

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

@@ -31,11 +31,19 @@ module Pod
         end
 
         def spm_dependencies_for(target)
-          @spm_dependencies_by_target[target.to_s]
+          @spm_dependencies_by_target[target.to_s].to_a
         end
 
         def spm_products_for(target)
-          spm_dependencies_for(target).flat_map { |d| @spm_products[d.product] }.uniq(&:name)
+          spm_dependencies_for(target).flat_map { |d| @spm_products[d.product].to_a }.uniq(&:name)
+        end
+
+        def linker_flags_for(target)
+          flags = spm_dependencies_for(target).flat_map { |d| d.pkg.linker_flags }
+          flags += spm_products_for(target).map do |p|
+            p.linked_as_framework? ? "-framework \"#{p.name}\"" : "-l\"#{p.name}.o\""
+          end
+          flags.uniq
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-spm
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Thuyen Trinh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-12 00:00:00.000000000 Z
+date: 2024-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj