cocoapods-spm 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbcb911c20a1ba82d17dce1be6e78b74e4a1d8e2b32d60e38363ea67cbe4f8a8
-  data.tar.gz: 9b15453f318dec4cd6d54119e8245023a200befa673e490a35f59b6768015c40
+  metadata.gz: c78bcd5423ddfdab166cce2e0d9dbb0f856c316e96c9153b0d0e63e24dc522c3
+  data.tar.gz: e2bc22e33f7bd411ea0f185a625a2b22a746e3ff97e8a4f82733d58272f2504b
 SHA512:
-  metadata.gz: 209616fc087b99e98a39356f06a458190ba59d5e9272355dcaa3caa0fd312557a159a0c7e2bd159ea1cd420aff8f1c206c124a328b6cd7b7be40c656343fff14
-  data.tar.gz: d7dd3483408ec69e18e4bebd8a8a7055ddd570f9ddd878e6e7b82d99c84914476a89e1a2cb05f29880904aa6823bbf074e83d8ccc52bbcd0eca3f5a0f6792978
+  metadata.gz: e73df51891edf85f7f5568a93e0bddf1783fd6277ca184e9116be5192bb8a466ee4f33236beb36fa24ce8430f92a9ecc1f9dea614328dabec2b8a41255df2014
+  data.tar.gz: ea3fe8933774d6173401d5d8994a8107d370d17e83d9e150fa95c0e68029cdf10db818ff4e5f03aab343244c453f537837bb2eeb1778f0a5ff923c4a8ff76925

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

@@ -1,7 +1,15 @@
 module Pod
   class Installer
-    def native_targets
-      pods_project.targets + pod_target_subprojects.flat_map(&:targets)
+    module InstallerMixin
+      def native_targets
+        projects_to_integrate.flat_map(&:targets)
+      end
+
+      def projects_to_integrate
+        [pods_project] + pod_target_subprojects
+      end
     end
+
+    include InstallerMixin
   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

@@ -1,11 +1,13 @@
 require "cocoapods-spm/config"
 require "cocoapods-spm/def/podfile"
 require "cocoapods-spm/def/spec"
+require "cocoapods-spm/macro/metadata"
 
 module Pod
   module SPM
     class Hook
       include Config::Mixin
+      include Installer::InstallerMixin
 
       def initialize(context, options = {})
         @context = context
@@ -34,10 +36,6 @@ module Pod
         @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
@@ -94,6 +92,19 @@ module Pod
           end
         end
       end
+
+      def macro_metadata_for_pod(name)
+        return nil unless spm_config.all_macros.include?(name)
+
+        @macro_metadata_cache ||= {}
+        @macro_metadata_cache[name] = MacroMetadata.for_pod(name) unless @macro_metadata_cache.key?(name)
+        @macro_metadata_cache[name]
+      end
+
+      def pod_name_of_target(name)
+        target = @analysis_result.pod_targets.find { |x| x.name == name }
+        target.nil? ? name : target.pod_name
+      end
     end
   end
 end

data/lib/cocoapods-spm/hooks/post_integrate/{5.update_settings.rb → 05.update_settings.rb}

@@ -17,7 +17,7 @@ module Pod
           @macro_plugin_flag_by_config ||= begin
             hash = user_build_configurations.keys.to_h do |config|
               flags = macro_pods.keys.map do |name|
-                metadata = MacroMetadata.for_pod(name)
+                metadata = macro_metadata_for_pod(name)
                 impl_module_name = metadata.macro_impl_name
                 plugin_executable_path =
                   "#{path_prefix}/#{name}/" \

data/lib/cocoapods-spm/hooks/post_integrate/06.update_macro_platforms.rb

@@ -0,0 +1,26 @@
+require "cocoapods-spm/hooks/base"
+require "cocoapods-spm/macro/metadata"
+
+module Pod
+  module SPM
+    class Hook
+      class UpdateMacroPlatforms < Hook
+        def run
+          to_save = Set.new
+          native_targets.each do |target|
+            name = pod_name_of_target(target.name)
+            metadata = macro_metadata_for_pod(name)
+            next if metadata.nil?
+
+            settings = metadata.platform_build_settings
+            target.build_configurations.each do |config|
+              settings.each { |k, v| config.build_settings[k] = v }
+            end
+            to_save << target.project
+          end
+          to_save.each(&:save)
+        end
+      end
+    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/metadata.rb

@@ -12,6 +12,22 @@ module Pod
         end
         from_file(path)
       end
+
+      def platforms
+        raw["platforms"].to_h { |ds| [ds["platformName"], ds["version"]] }
+      end
+
+      def platform_build_settings
+        ds = {
+          "ios" => "IPHONEOS_DEPLOYMENT_TARGET",
+          "macos" => "MACOSX_DEPLOYMENT_TARGET",
+          "tvos" => "TVOS_DEPLOYMENT_TARGET",
+          "watchos" => "WATCHOS_DEPLOYMENT_TARGET",
+          "visionos" => "XROS_DEPLOYMENT_TARGET",
+          "driverkit" => "DRIVERKIT_DEPLOYMENT_TARGET",
+        }
+        platforms.transform_keys { |k| ds[k] }.reject { |k, _| k.nil? }
+      end
     end
   end
 end

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,3 +1,4 @@
+require "pry" if ENV["COCOAPODS_IMPORT_PRY"] == "true"
 require "cocoapods-spm/compatibility/all"
 require "cocoapods-spm/helpers/io"
 require "cocoapods-spm/helpers/patch"

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

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

@@ -63,7 +63,7 @@ module Pod
           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])
+          return cmps[...-1].join("-") if ["iOS", "macOS", "watchOS", "tvOS", "visionOS"].include?(cmps[-1])
 
           target.name
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-spm
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Thuyen Trinh
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-01 00:00:00.000000000 Z
+date: 2024-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -56,10 +56,11 @@ files:
 - lib/cocoapods-spm/helpers/patch.rb
 - lib/cocoapods-spm/hooks/base.rb
 - lib/cocoapods-spm/hooks/helpers/update_script.rb
-- lib/cocoapods-spm/hooks/post_integrate/1.add_spm_pkgs.rb
-- lib/cocoapods-spm/hooks/post_integrate/5.update_settings.rb
-- lib/cocoapods-spm/hooks/post_integrate/6.update_embed_frameworks_script.rb
-- lib/cocoapods-spm/hooks/post_integrate/7.update_copy_resources_script.rb
+- lib/cocoapods-spm/hooks/post_integrate/01.add_spm_pkgs.rb
+- lib/cocoapods-spm/hooks/post_integrate/05.update_settings.rb
+- lib/cocoapods-spm/hooks/post_integrate/06.update_macro_platforms.rb
+- lib/cocoapods-spm/hooks/post_integrate/20.update_embed_frameworks_script.rb
+- lib/cocoapods-spm/hooks/post_integrate/21.update_copy_resources_script.rb
 - lib/cocoapods-spm/macro/config.rb
 - lib/cocoapods-spm/macro/fetcher.rb
 - lib/cocoapods-spm/macro/metadata.rb
@@ -86,7 +87,7 @@ homepage: https://github.com/trinhngocthuyen/cocoapods-spm
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.33
-signing_key: 
+signing_key:
 specification_version: 4
 summary: CocoaPods plugin to add SPM dependencies to CocoaPods targets
 test_files: []