cocoapods-spm 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24612d253fbaf74d473abe53ca7b3293e06b5dda91b1ef52fd2795f96d5a3a97
-  data.tar.gz: 1394cfc0a85d5378fab7929926f1f65acd7635a9236f427e2f746b4bc973a145
+  metadata.gz: c78bcd5423ddfdab166cce2e0d9dbb0f856c316e96c9153b0d0e63e24dc522c3
+  data.tar.gz: e2bc22e33f7bd411ea0f185a625a2b22a746e3ff97e8a4f82733d58272f2504b
 SHA512:
-  metadata.gz: b9a897b591b5265b2ab5fc760261fd4d2bc319d26e23a4dcf603e51f8dd40103b0d67c3ee6fbc53749727373d748ae8b0252ad2b2e74d4d972ed6f0716cc7267
-  data.tar.gz: 062b87214c04d88dc26fbc871951006eb69c65055410a7537c03c5f7177e039adf2cf93f6ece2d718e51dd8eec66d392acd8462157dbd5634ef6f4347d587221
+  metadata.gz: e73df51891edf85f7f5568a93e0bddf1783fd6277ca184e9116be5192bb8a466ee4f33236beb36fa24ce8430f92a9ecc1f9dea614328dabec2b8a41255df2014
+  data.tar.gz: ea3fe8933774d6173401d5d8994a8107d370d17e83d9e150fa95c0e68029cdf10db818ff4e5f03aab343244c453f537837bb2eeb1778f0a5ff923c4a8ff76925

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/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/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/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.10
 platform: ruby
 authors:
 - Thuyen Trinh
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-08 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: []