cocoapods-spm 0.0.2.rc7194768598 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 023cb57cc496da534db60773efea73bdcdc40a869a7edeee06e52c16344dbe98
-  data.tar.gz: 5cc2ca8ee116d74324e187a1a3150386f74e01a9994f5d4a05278fc55820986f
+  metadata.gz: 43e96257dc89796c000a5115e81d36fc9ef9df8208eba676a2fd1b6961864b84
+  data.tar.gz: 1aafa45b40759edbcb3e3ceee7a699038ca2638f8d6c432bd8a4dce2a5321783
 SHA512:
-  metadata.gz: c3ee693e680264039630ac55ea94d477bab5a5e8e264b3af1f9d696b40d2d232a4e006495746d1b2722b633acabee97b937be065d1e4eb465554b41cdff33d90
-  data.tar.gz: 87e655ba9232d80f6277bfef1cf234876fd8a164dcac3e2a2be1298f313b2528ed267ff5697cc40c21039c5672df2659f19b914b448cc47947486f9179006aa8
+  metadata.gz: c6673bab5c9be9aef9834c835fa6f732e7107cd19dedee9fade7674a11da5e08a59456e829a867e5dc5bc683a7506009bd947178f3b1184ed4e2d8f3100798e8
+  data.tar.gz: db59493b90243638c878ed6d9140155c9059f147ee3dda1c826ea2d2c0739329d10ddf2e5c6c5b53968b6cb85ba9159421e3405fae66d5f2ba340869f13bf5cf

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

@@ -3,6 +3,8 @@ require "cocoapods-spm/config"
 module Pod
   class Podfile
     module DSL
+      attr_accessor :spm_analyzer
+
       alias origin_pod pod
       def config_cocoapods_spm(options)
         SPM::Config.instance.dsl_config = options
@@ -26,6 +28,19 @@ module Pod
         current_target_definition.store_spm_pkg(name, options)
       end
 
+      def spm_pkgs_for(target)
+        spm_pkgs_by_aggregate_target[target.to_s]
+      end
+
+      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)]
+          end
+        end
+      end
+
       private
 
       def prepare_macro_pod_dir(name, requirement)

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

@@ -14,6 +14,15 @@ module Pod
         @pkg = pkg
       end
 
+      def linkage
+        # TODO: How to detect the linkage of an SPM library?
+        @pkg.linkage.is_a?(Hash) ? @pkg.linkage[@product] : @pkg.linkage
+      end
+
+      def dynamic?
+        linkage == :dynamic
+      end
+
       def inspect
         "#<#{self.class} name=#{name} product=#{product} pkg=#{pkg}>"
       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, :linkage
 
       def initialize(name, options = {})
         @name = name
@@ -12,6 +12,7 @@ module Pod
         @requirement = requirement_from(options)
         @url = options[:url]
         @relative_path = options[:relative_path]
+        @linkage = options[:linkage]
       end
 
       def inspect

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

@@ -12,6 +12,13 @@ module Pod
           ref.product_name = product
           ref
         end
+
+        def create_target_dependency_ref(product)
+          ref = project.new(BaseObject::PBXTargetDependency)
+          ref.name = product
+          ref.product_ref = create_pkg_product_dependency_ref(product)
+          ref
+        end
       end
 
       BaseObject = Xcodeproj::Project::Object

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

@@ -35,8 +35,8 @@ module Pod
           pods_project.targets.each do |target|
             @spm_analyzer.spm_dependencies_by_target[target.name].to_a.each do |dep|
               pkg_ref = spm_pkg_refs[dep.pkg.name]
-              product_ref = pkg_ref.create_pkg_product_dependency_ref(dep.product)
-              target.package_product_dependencies << product_ref
+              target_dep_ref = pkg_ref.create_target_dependency_ref(dep.product)
+              target.dependencies << target_dep_ref
             end
           end
         end

data/lib/cocoapods-spm/hooks/post_integrate/update_embed_frameworks_script.rb

@@ -0,0 +1,58 @@
+require "cocoapods-spm/hooks/base"
+
+module Pod
+  module SPM
+    class Hook
+      class UpdateEmbedFrameworksScript < Hook
+        def run
+          aggregate_targets.each do |target|
+            next if framework_paths_for(target).empty?
+
+            update_embed_frameworks_script(target)
+            user_build_configurations.each_key do |config|
+              update_embed_frameworks_script_files_path(target, config)
+            end
+          end
+        end
+
+        private
+
+        def framework_paths_for(target)
+          @dynamic_deps_by_target ||=
+            @spm_analyzer
+            .spm_dependencies_by_target
+            .transform_values { |deps| deps.select(&:dynamic?) }
+          @dynamic_deps_by_target[target.to_s].map do |d|
+            "${BUILT_PRODUCTS_DIR}/PackageFrameworks/#{d.product}.framework"
+          end
+        end
+
+        def update_embed_frameworks_script(target)
+          lines = framework_paths_for(target).map { |p| "install_framework \"#{p}\"" }
+          target.embed_frameworks_script_path.open("a") do |f|
+            f << "\n" << <<~SH
+              # --------------------------------------------------------
+              # Added by `cocoapods-spm` to embed SPM package frameworks
+              # --------------------------------------------------------
+              #{lines.join("\n")}
+              # --------------------------------------------------------
+            SH
+          end
+        end
+
+        def update_embed_frameworks_script_files_path(target, config)
+          input_paths = framework_paths_for(target)
+          output_paths = input_paths.map do |p|
+            "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{File.basename(p)}"
+          end
+          target.embed_frameworks_script_input_files_path(config).open("a") do |f|
+            input_paths.each { |p| f << "\n" << p }
+          end
+          target.embed_frameworks_script_output_files_path(config).open("a") do |f|
+            output_paths.each { |p| f << "\n" << p }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-spm/hooks/pre_integrate/update_settings.rb

@@ -47,14 +47,21 @@ module Pod
 
           # For packages to work in the main target
           perform_settings_update(
-            update_aggregate_targets: lambda do |target, _, _|
-              spm_deps = @spm_analyzer.spm_dependencies_by_target[target.to_s].to_a
-              flags = spm_deps.map { |d| "-l\"#{d.product}.o\"" }
-              { "OTHER_LDFLAGS" => flags }
+            update_targets: lambda do |target, _, _|
+              { "OTHER_LDFLAGS" => linker_flags_for(target) }
             end
           )
         end
 
+        def linker_flags_for(target)
+          spm_deps = @spm_analyzer.spm_dependencies_by_target[target.to_s].to_a
+          framework_flags = spm_deps.select(&:dynamic?).map { |d| "-framework \"#{d.product}\"" }
+          framework_flags << '-F"${PODS_CONFIGURATION_BUILD_DIR}/PackageFrameworks"' unless framework_flags.empty?
+          library_flags = spm_deps.reject(&:dynamic?).map { |d| "-l\"#{d.product}.o\"" }
+          library_flags << '-L"${PODS_CONFIGURATION_BUILD_DIR}"' unless library_flags.empty?
+          framework_flags + library_flags
+        end
+
         def update_swift_include_paths
           return unless @spm_analyzer.spm_pkgs
 

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

@@ -15,6 +15,10 @@ module Pod
         analyze_spm_dependencies_by_target
       end
 
+      def spm_dependencies_for(target)
+        @spm_dependencies_by_target[target.to_s]
+      end
+
       private
 
       def analyze_spm_pkgs
@@ -40,11 +44,10 @@ module Pod
           @spm_dependencies_by_target[target.to_s] = merge_spm_dependencies(spm_dependencies)
         end
 
-        common_spm_pkgs = @podfile.root_target_definitions.flat_map(&:spm_pkgs)
-        @podfile.target_definition_list.reject(&:abstract?).each do |target|
-          existing = @spm_dependencies_by_target[target.label].to_a
-          spm_dependencies = (common_spm_pkgs + target.spm_pkgs).flat_map(&:to_dependencies)
-          @spm_dependencies_by_target[target.label] = merge_spm_dependencies(existing + spm_dependencies)
+        @podfile.spm_pkgs_by_aggregate_target.each do |target, pkgs|
+          existing = @spm_dependencies_by_target[target].to_a
+          spm_dependencies = pkgs.flat_map(&:to_dependencies)
+          @spm_dependencies_by_target[target] = merge_spm_dependencies(existing + spm_dependencies)
         end
       end
 

data/lib/cocoapods-spm/main.rb

@@ -1,5 +1,6 @@
 require "cocoapods-spm/def/target_definition"
 require "cocoapods-spm/def/podfile"
 require "cocoapods-spm/def/spec"
+require "cocoapods-spm/patch/aggregate_target"
 require "cocoapods-spm/patch/installer"
 require "cocoapods-spm/command/spm"

data/lib/cocoapods-spm/patch/aggregate_target.rb

@@ -0,0 +1,13 @@
+module Pod
+  class AggregateTarget
+    alias origin_includes_frameworks? includes_frameworks?
+
+    def includes_frameworks?
+      origin_includes_frameworks? || includes_dynamic_spm_dependencies?
+    end
+
+    def includes_dynamic_spm_dependencies?
+      podfile.spm_analyzer.spm_dependencies_for(self).any?(&:dynamic)
+    end
+  end
+end

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

@@ -56,8 +56,11 @@ module Pod
 
     def resolve_spm_dependencies
       # TODO: convert aggregate_targets to umbrella_targets?
-      @spm_analyzer ||= Pod::Installer::SPMAnalyzer.new(podfile, aggregate_targets)
-      @spm_analyzer.analyze
+      UI.section "Analyzing SPM dependencies" do
+        @spm_analyzer ||= Pod::Installer::SPMAnalyzer.new(podfile, aggregate_targets)
+        @spm_analyzer.analyze
+        podfile.spm_analyzer = @spm_analyzer
+      end
     end
   end
 end

metadata

@@ -1,57 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-spm
 version: !ruby/object:Gem::Version
-  version: 0.0.2.rc7194768598
+  version: 0.0.3
 platform: ruby
 authors:
 - Thuyen Trinh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-13 00:00:00.000000000 Z
+date: 2023-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
+  name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.23.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.23.0
 description: CocoaPods plugin to add SPM dependencies to CocoaPods targets
 email:
 - trinhngocthuyen@gmail.com
@@ -72,6 +44,7 @@ files:
 - lib/cocoapods-spm/def/xcodeproj.rb
 - lib/cocoapods-spm/hooks/base.rb
 - lib/cocoapods-spm/hooks/post_integrate/add_spm_pkgs.rb
+- lib/cocoapods-spm/hooks/post_integrate/update_embed_frameworks_script.rb
 - lib/cocoapods-spm/hooks/pre_integrate/update_settings.rb
 - lib/cocoapods-spm/installer/analyzer.rb
 - lib/cocoapods-spm/macro/fetcher.rb
@@ -79,6 +52,7 @@ files:
 - lib/cocoapods-spm/macro/prebuilder.rb
 - lib/cocoapods-spm/main.rb
 - lib/cocoapods-spm/metadata.rb
+- lib/cocoapods-spm/patch/aggregate_target.rb
 - lib/cocoapods-spm/patch/installer.rb
 - lib/cocoapods_plugin.rb
 homepage: https://github.com/trinhngocthuyen/cocoapods-spm
@@ -96,9 +70,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: