cocoapods-spm 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4fe180c87aca4c93c0309f995109ef39507f5e5f82183a1e6e15d247e153a3b
-  data.tar.gz: 8f913beccd589a820ec92b4a5ef6af7c0373f3b878cd3e78eac18720e3383b8b
+  metadata.gz: 24612d253fbaf74d473abe53ca7b3293e06b5dda91b1ef52fd2795f96d5a3a97
+  data.tar.gz: 1394cfc0a85d5378fab7929926f1f65acd7635a9236f427e2f746b4bc973a145
 SHA512:
-  metadata.gz: '064788c5e4bbc60ebbcf3bb3f9334c8f30a75d1102c26181299978894e42554f9430adda3d1e7c8b17c9572f146e9a6fa3a0179f20db7be7cf1f95e9c31601b8'
-  data.tar.gz: 53adc8060fe965e1ef8566a8fbf1844ac9adbf3adddd93fcab6e52afd4750adb97273379247bbb3d13e5c5492622b2763c9b7e4682ee365cf96f706076ed7180
+  metadata.gz: b9a897b591b5265b2ab5fc760261fd4d2bc319d26e23a4dcf603e51f8dd40103b0d67c3ee6fbc53749727373d748ae8b0252ad2b2e74d4d972ed6f0716cc7267
+  data.tar.gz: 062b87214c04d88dc26fbc871951006eb69c65055410a7537c03c5f7177e039adf2cf93f6ece2d718e51dd8eec66d392acd8462157dbd5634ef6f4347d587221

data/lib/cocoapods-spm/config/spm.rb

@@ -9,6 +9,17 @@ module Pod
         def macro_pods
           pod_config.podfile.macro_pods
         end
+
+        def local_macro_pod?(name)
+          !local_macro_pod_dir(name).nil?
+        end
+
+        def local_macro_pod_dir(name)
+          opts = macro_pods.fetch(name, {})
+          return Path(opts[:podspec]).dirname if opts.key?(:podspec)
+
+          Pathname(opts[:path]) if opts.key?(:path)
+        end
       end
 
       attr_accessor :dsl_config, :cli_config

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

@@ -0,0 +1,7 @@
+module Pod
+  class Installer
+    def native_targets
+      pods_project.targets + pod_target_subprojects.flat_map(&:targets)
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module Pod
     attr_accessor :spm_resolver
 
     def config_cocoapods_spm(options)
-      SPM::Config.instance.dsl_config = options
+      SPM::Config.instance.dsl_config.merge!(options)
     end
 
     def macro_pods
@@ -56,7 +56,7 @@ module Pod
     private
 
     def prepare_macro_pod_dir(name, requirement)
-      link = requirement[:git]
+      link = requirement[:git] || "N/A"
       podspec_content = <<~HEREDOC
         Pod::Spec.new do |s|
           s.name = "#{name}"

data/lib/cocoapods-spm/helpers/io.rb

@@ -6,6 +6,7 @@ module Pod
 
       src = Pathname.new(src) unless src.is_a?(Pathname)
       dst = Pathname.new(dst) unless dst.is_a?(Pathname)
+      dst.dirname.mkpath unless dst.dirname.exist?
       dst.delete if dst.exist?
       File.symlink(src.absolute? ? src : src.realpath, dst)
     end

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

@@ -30,6 +30,14 @@ module Pod
         @analysis_result.targets
       end
 
+      def pod_target_subprojects
+        @context.pod_target_subprojects
+      end
+
+      def projects_to_integrate
+        [pods_project] + pod_target_subprojects
+      end
+
       def user_build_configurations
         @user_build_configurations ||= (pod_targets + aggregate_targets)[0].user_build_configurations
       end

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

@@ -8,37 +8,21 @@ module Pod
         def run
           return if @spm_resolver.result.spm_pkgs.empty?
 
-          add_spm_pkg_refs_to_project
-          add_spm_products_to_targets
-          pods_project.save
-        end
-
-        private
-
-        def spm_pkg_refs
-          @spm_pkg_refs ||= {}
-        end
-
-        def add_spm_pkg_refs_to_project
-          @spm_pkg_refs = @spm_resolver.result.spm_pkgs.to_h do |pkg|
-            pkg_ref = pkg.create_pkg_ref(pods_project)
-            pods_project.root_object.package_references << pkg_ref
-            [pkg.name, pkg_ref]
-          end
-        end
-
-        def spm_pkgs_by_target
-          @spm_pkgs_by_target ||= {}
-        end
-
-        def add_spm_products_to_targets
-          pods_project.targets.each do |target|
-            @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
-              target.package_product_dependencies << target_dep_ref.product_ref if dep.pkg.use_default_xcode_linking?
+          projects_to_integrate.compact.each do |project|
+            spm_pkg_refs = {}
+            project.targets.each do |target|
+              @spm_resolver.result.spm_dependencies_for(target).each do |dep|
+                pkg_ref = dep.pkg.create_pkg_ref(project)
+                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?
+                spm_pkg_refs.store(dep.pkg.name, pkg_ref)
+              end
+            end
+            spm_pkg_refs.each_value do |pkg_ref|
+              project.root_object.package_references << pkg_ref
             end
+            project.save
           end
         end
       end

data/lib/cocoapods-spm/macro/fetcher.rb

@@ -1,3 +1,4 @@
+require "cocoapods-spm/helpers/io"
 require "cocoapods-spm/macro/metadata"
 require_relative "config"
 
@@ -16,8 +17,7 @@ module Pod
       end
 
       def run
-        UI.puts "Fetching macro #{name}...".magenta
-        download_macro_source
+        prepare_macro_source
         macro_dir = spm_config.macro_root_dir / name
         macro_downloaded_dir = spm_config.macro_downloaded_root_dir / name
         FileUtils.copy_entry(
@@ -29,6 +29,10 @@ module Pod
 
       private
 
+      def local?
+        local_macro_pod?(name)
+      end
+
       def generate_metadata
         raise "Package.swift not exist in #{macro_downloaded_dir}" \
           unless (macro_downloaded_dir / "Package.swift").exist?
@@ -37,7 +41,23 @@ module Pod
         metadata_path.write(raw)
       end
 
+      def prepare_macro_source
+        if local?
+          symlink_local_macro_source
+        else
+          download_macro_source
+        end
+      end
+
+      def symlink_local_macro_source
+        UI.message "Creating symlink to local macro source: #{name}..."
+        # For local macro pod, just need to copy local pod dir to downloaded sandbox,
+        # or create a symlink .spm.pods/macros/.downloaded/FOO -> LocalPods/FOO
+        IOUtils.symlink(local_macro_pod_dir(name), macro_downloaded_dir)
+      end
+
       def download_macro_source
+        UI.puts "Downloading source for macro: #{name}...".magenta
         @specs_by_platform ||= @podfile.root_target_definitions.to_h do |definition|
           spec = Pod::Spec.from_file(spm_config.macro_root_dir / name / "#{name}.podspec")
           [definition.platform, [spec]]

data/lib/cocoapods-spm/macro/pod_installer.rb

@@ -27,7 +27,7 @@ module Pod
       end
 
       def install_macro_pod!
-        fetcher.run
+        fetcher.run if local_macro_pod?(name) || !fetcher.metadata_path.exist?
         prebuilder.run
       end
     end

data/lib/cocoapods-spm/macro/prebuilder.rb

@@ -23,17 +23,25 @@ module Pod
         config = spm_config.macro_config
         impl_module_name = metadata.macro_impl_name
         prebuilt_binary = macro_prebuilt_dir / "#{impl_module_name}-#{config}"
-        return if spm_config.dont_prebuild_macros_if_exist? && prebuilt_binary.exist?
+        if spm_config.dont_prebuild_macros_if_exist? && prebuilt_binary.exist?
+          return UI.message "Macro binary exists at #{prebuilt_binary} -> Skip prebuilding macro"
+        end
 
         UI.section "Building macro implementation: #{impl_module_name} (#{config})...".green do
           Dir.chdir(macro_downloaded_dir) do
+            swift! ["--version"]
             swift! ["build", "-c", config, "--product", impl_module_name]
           end
         end
 
         prebuilt_binary.parent.mkpath
+        macro_downloaded_build_config_dir = macro_downloaded_dir / ".build" / config
+        macro_build_binary_file_path = macro_downloaded_build_config_dir / impl_module_name
+        unless macro_build_binary_file_path.exist?
+          macro_build_binary_file_path = macro_downloaded_build_config_dir / "#{impl_module_name}-tool"
+        end
         FileUtils.copy_entry(
-          macro_downloaded_dir / ".build" / config / impl_module_name,
+          macro_build_binary_file_path,
           prebuilt_binary
         )
       end

data/lib/cocoapods-spm/main.rb

@@ -1,8 +1,10 @@
+require "pry" if ENV["COCOAPODS_IMPORT_PRY"] == "true"
 require "cocoapods-spm/compatibility/all"
 require "cocoapods-spm/helpers/io"
 require "cocoapods-spm/helpers/patch"
 require "cocoapods-spm/config"
 require "cocoapods-spm/executables"
+require "cocoapods-spm/def/installer"
 require "cocoapods-spm/def/target_definition"
 require "cocoapods-spm/def/podfile"
 require "cocoapods-spm/def/spec"

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

@@ -34,6 +34,17 @@ module Pod
       run_spm_post_integrate_hooks
     end
 
+    patch_method :sandbox_state do
+      state = origin_sandbox_state
+      # NOTE: For macro pods, we force-trigger their source installers even in incremental installations.
+      # This is done by altering the `sandbox_state` & marking them as `added`
+      spm_config.all_macros.each do |name|
+        %i[unchanged changed deleted].each { |key| state.send(key).delete(name) }
+        state.added << (name)
+      end
+      state
+    end
+
     private
 
     def hook_options

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-spm
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Thuyen Trinh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-25 00:00:00.000000000 Z
+date: 2024-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -44,6 +44,7 @@ files:
 - lib/cocoapods-spm/config/pod.rb
 - lib/cocoapods-spm/config/project.rb
 - lib/cocoapods-spm/config/spm.rb
+- lib/cocoapods-spm/def/installer.rb
 - lib/cocoapods-spm/def/podfile.rb
 - lib/cocoapods-spm/def/spec.rb
 - lib/cocoapods-spm/def/spm_dependency.rb