cocoapods-spm 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c78bcd5423ddfdab166cce2e0d9dbb0f856c316e96c9153b0d0e63e24dc522c3
-  data.tar.gz: e2bc22e33f7bd411ea0f185a625a2b22a746e3ff97e8a4f82733d58272f2504b
+  metadata.gz: 6c3b50f5ee1f6aac5f97a26a629a3db6e979d9d3f64d23d8b0ad09efb64b65a8
+  data.tar.gz: f9a36254b07ad0a945a4f74a408f86e5c64061401b1313d1176a6cf6d9a3b961
 SHA512:
-  metadata.gz: e73df51891edf85f7f5568a93e0bddf1783fd6277ca184e9116be5192bb8a466ee4f33236beb36fa24ce8430f92a9ecc1f9dea614328dabec2b8a41255df2014
-  data.tar.gz: ea3fe8933774d6173401d5d8994a8107d370d17e83d9e150fa95c0e68029cdf10db818ff4e5f03aab343244c453f537837bb2eeb1778f0a5ff923c4a8ff76925
+  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/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/post_integrate/05.update_settings.rb

@@ -13,7 +13,8 @@ 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|

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/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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-spm
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Thuyen Trinh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-29 00:00:00.000000000 Z
+date: 2025-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -54,6 +54,7 @@ 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/01.add_spm_pkgs.rb