cocoapods-spm 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24612d253fbaf74d473abe53ca7b3293e06b5dda91b1ef52fd2795f96d5a3a97
-  data.tar.gz: 1394cfc0a85d5378fab7929926f1f65acd7635a9236f427e2f746b4bc973a145
+  metadata.gz: 6c3b50f5ee1f6aac5f97a26a629a3db6e979d9d3f64d23d8b0ad09efb64b65a8
+  data.tar.gz: f9a36254b07ad0a945a4f74a408f86e5c64061401b1313d1176a6cf6d9a3b961
 SHA512:
-  metadata.gz: b9a897b591b5265b2ab5fc760261fd4d2bc319d26e23a4dcf603e51f8dd40103b0d67c3ee6fbc53749727373d748ae8b0252ad2b2e74d4d972ed6f0716cc7267
-  data.tar.gz: 062b87214c04d88dc26fbc871951006eb69c65055410a7537c03c5f7177e039adf2cf93f6ece2d718e51dd8eec66d392acd8462157dbd5634ef6f4347d587221
+  metadata.gz: 9129545f35676f21d34e904e5517b3a05d0fc18eaff8ca0e9fa3045d97d965ab61f7f0c07428df4e663a482d585de920e499f04d2cd76f5732f323295f1ae86b
+  data.tar.gz: 16461e45669ff05d949264c52dfd7b820e562ed5fd8096d86593e07c2a9f4fdb974e22923bc8f79c22d79d95b68c6573317c51a8fe0353862bf1aa1b8e85608a

data/lib/cocoapods-spm/command/macro/fetch.rb

@@ -22,6 +22,7 @@ module Pod
           end
 
           def run
+            verify_podfile_exists!
             spm_config.macros.each do |name|
               SPM::MacroFetcher.new(name: name, can_cache: true).run
             end

data/lib/cocoapods-spm/command/macro/prebuild.rb

@@ -26,6 +26,7 @@ module Pod
           end
 
           def run
+            verify_podfile_exists!
             spm_config.macros.each do |name|
               SPM::MacroPrebuilder.new(name: name).run
             end

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

@@ -5,6 +5,7 @@ module Pod
   class Command
     class Spm < Command
       include SPM::Config::Mixin
+      include ProjectDirectory
 
       self.summary = "Working with SPM"
       self.abstract_command = true

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

@@ -1,7 +1,11 @@
+require "cocoapods-spm/helpers/path"
+
 module Pod
   module SPM
     class Config
       module PodConfigMixin
+        include PathMixn
+
         def pod_config
           Pod::Config.instance
         end

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

@@ -1,3 +1,5 @@
+require "cocoapods-spm/helpers/path"
+
 module Pod
   module SPM
     class Config

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

@@ -1,6 +1,10 @@
+require "cocoapods-spm/helpers/path"
+
 module Pod
   module SPM
     class Config
+      include PathMixn
+
       module SPMConfigMixin
         def spm_config
           Config.instance
@@ -61,7 +65,7 @@ module Pod
       end
 
       def root_dir
-        @root_dir ||= Pathname(".spm.pods")
+        @root_dir ||= prepare_dir(Pod::Config.instance.installation_root / ".spm.pods")
       end
 
       def pkg_root_dir
@@ -99,13 +103,6 @@ module Pod
       def pkg_metadata_dir
         @pkg_metadata_dir ||= prepare_dir(pkg_root_dir / "metadata")
       end
-
-      private
-
-      def prepare_dir(dir)
-        dir.mkpath
-        dir
-      end
     end
   end
 end

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

@@ -18,7 +18,8 @@ module Pod
       macro = requirements[0].delete(:macro) if requirements.first.is_a?(Hash)
       macro ||= {}
       unless macro.empty?
-        requirements[0][:path] = prepare_macro_pod_dir(name, macro).to_s
+        macro_dir = prepare_macro_pod_dir(name, macro)
+        requirements[0][:path] = macro_dir.relative_path_from(Pod::Config.instance.installation_root).to_s
         macro_pods[name] = macro
       end
       origin_pod(name, *requirements)

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

@@ -22,6 +22,7 @@ module Pod
         @relative_path = relative_path_from(options)
         @requirement = requirement_from(options)
         @linking_opts = options[:linking] || {}
+        validate!
       end
 
       def slug
@@ -86,6 +87,16 @@ module Pod
 
       private
 
+      def validate!
+        if use_default_xcode_linking? # rubocop:disable Style/GuardClause
+          UI.warn <<~HEREDOC
+            The option :use_default_xcode_linking in the following declaration is deprecated:
+            #{@_options}
+            You are recommended to omit this option in `spm_pkg`.
+          HEREDOC
+        end
+      end
+
       def requirement_from(options)
         return if @relative_path
 

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

@@ -0,0 +1,10 @@
+module Pod
+  module SPM
+    module PathMixn
+      def prepare_dir(dir)
+        dir.mkpath
+        dir
+      end
+    end
+  end
+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}

@@ -13,11 +13,12 @@ module Pod
         private
 
         def macro_plugin_flag_by_config
-          path_prefix = "${PODS_ROOT}/../#{spm_config.macro_prebuilt_root_dir}"
+          prebuild_root_dir = spm_config.macro_prebuilt_root_dir.relative_path_from(pod_config.installation_root)
+          path_prefix = "${PODS_ROOT}/../#{prebuild_root_dir}"
           @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/config.rb

@@ -2,6 +2,7 @@ module Pod
   module SPM
     module MacroConfigMixin
       include Config::Mixin
+      include PathMixn
 
       def macro_downloaded_dir
         spm_config.macro_downloaded_root_dir / name
@@ -11,6 +12,10 @@ module Pod
         @macro_dir ||= spm_config.macro_root_dir / name
       end
 
+      def macro_scratch_dir
+        @macro_scratch_dir ||= prepare_dir(spm_config.macro_root_dir / ".build")
+      end
+
       def macro_prebuilt_dir
         spm_config.macro_prebuilt_root_dir / name
       end

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/prebuilder.rb

@@ -28,14 +28,23 @@ module Pod
         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
+          swift! ["--version"]
+          swift! [
+            "build",
+            "-c", config,
+            "--product", impl_module_name,
+            "--package-path", macro_downloaded_dir,
+            "--scratch-path", macro_scratch_dir,
+          ]
+          # Workaround: When building a macro, the debug.yaml under the scratch dir contains some corrupted info,
+          # causing the following failure when building the next macro:
+          #     No target named 'OrcamImpl-debug.exe' in build description
+          # Idk what this file is for, but deleting it helps
+          macro_scratch_dir.glob("*.yaml").each { |p| p.delete if p.exist? }
         end
 
         prebuilt_binary.parent.mkpath
-        macro_downloaded_build_config_dir = macro_downloaded_dir / ".build" / config
+        macro_downloaded_build_config_dir = macro_scratch_dir / 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"

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.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Thuyen Trinh
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-08 00:00:00.000000000 Z
+date: 2025-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -54,12 +54,14 @@ files:
 - lib/cocoapods-spm/executables.rb
 - lib/cocoapods-spm/helpers/io.rb
 - lib/cocoapods-spm/helpers/patch.rb
+- lib/cocoapods-spm/helpers/path.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 +88,7 @@ homepage: https://github.com/trinhngocthuyen/cocoapods-spm
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,7 +104,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: []