cocoapods-spm 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 922b55ffd54350ec1e1be78c273b0078acfcdf7bca7f29c87281367507ffcf13
-  data.tar.gz: 9e0d2e7202e2d5486d92e039aae84b0caeb690b7c6e8c73a3b57110177ec8b14
+  metadata.gz: e1e1e2bd492fb8080c1d1d0ab60b4abe580d3540559ba11085b0b2a93826de54
+  data.tar.gz: 1a30fc92b2e7cdc5082f6fea26635f55345a9ae08d835450e66041028b862036
 SHA512:
-  metadata.gz: c02a69fa12d098b6103d3eccb6dbf5b19ba50473b8c23913b6e5f17c9fd067c7fac3539c9a84264ba9a614c20771c4f641c0640a6c63a862aa2c5d7fc6e35154
-  data.tar.gz: 5bafa557cfb91f192eaf0923e5e86503a490442104f102abd69a5b1e458395fcb1980394e0d4a65a567dd80f93bff1034ea118f37e09d2cf038dd8e83eaa4597
+  metadata.gz: f7941760c3ec1e4be209ba35108e80db527218f6862f1fd4ffa87cbfde60688bd9e1aa735193f2018abd77593d0e8c47bfe652a60c577391a758cff7b47c8ccb
+  data.tar.gz: 21df8075d35796d309ed868cbfe7f07b53c57c325c3e3a298b7eabab3239d658805a54d291ed6f9fdf3bc06605210940f55f636c6e362e1932e828e72ad77985

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

@@ -0,0 +1,31 @@
+module Pod
+  class Command
+    class Spm < Command
+      class Clean < Spm
+        self.summary = "Clean caches"
+        def self.options
+          [
+            ["--all", "Clean all"],
+            ["--macros", "Clean macros"],
+            ["--packages", "Clean packages"],
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          super
+          @clean_all = argv.flag?("all")
+          @clean_macros = argv.flag?("macros")
+          @clean_pkgs = argv.flag?("packages")
+        end
+
+        def run
+          to_clean = []
+          to_clean << spm_config.pkg_root_dir if @clean_pkgs
+          to_clean << spm_config.macro_root_dir if @clean_macros
+          to_clean << spm_config.root_dir if @clean_all
+          to_clean.each { |dir| dir.rmtree if dir.exist? }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+module Pod
+  class Command
+    class Spm < Command
+      def self.bind_command(cls)
+        Class.new(Spm) do
+          define_method(:cls) { cls }
+
+          self.summary = "[Deprecated] #{cls.summary}"
+
+          def self.options
+            cls.options
+          end
+
+          def initialize(argv)
+            name = self.class.name.demodulize.downcase
+            warn "[DEPRECATION] `pod spm #{name}` is deprecated. Please use `pod spm macro #{name}` instead.".yellow
+            @_binded = cls.new(argv)
+            super
+          end
+
+          def validate!
+            @_binded.validate!
+          end
+
+          def run
+            @_binded.run
+          end
+        end
+      end
+
+      Fetch = bind_command(Macro::Fetch)
+      Prebuild = bind_command(Macro::Prebuild)
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+require "cocoapods-spm/macro/fetcher"
+
+module Pod
+  class Command
+    class Spm < Command
+      class Macro < Spm
+        class Fetch < Macro
+          self.summary = "Fetch macros"
+          def self.options
+            [
+              ["--all", "Prebuild all macros"],
+              ["--macros=foo", "Macros to prebuild, separated by comma (,)"],
+            ].concat(super)
+          end
+
+          def initialize(argv)
+            super
+            update_cli_config(
+              all: argv.flag?("all"),
+              macros: argv.option("macros", "").split(",")
+            )
+          end
+
+          def run
+            spm_config.macros.each do |name|
+              SPM::MacroFetcher.new(name: name, can_cache: true).run
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+require "cocoapods-spm/macro/prebuilder"
+
+module Pod
+  class Command
+    class Spm < Command
+      class Macro < Spm
+        class Prebuild < Macro
+          self.summary = "Prebuild macros"
+          def self.options
+            [
+              ["--all", "Prebuild all macros"],
+              ["--macros=foo", "Macros to prebuild, separated by comma (,)"],
+              ["--config=foo", "Config (debug/release) to prebuild macros"],
+            ].concat(super)
+          end
+
+          def initialize(argv)
+            super
+            update_cli_config(
+              all: argv.flag?("all"),
+              macros: argv.option("macros", "").split(","),
+              config: argv.option("config"),
+              dont_prebuild_macros: false,
+              dont_prebuild_macros_if_exist: false
+            )
+          end
+
+          def run
+            spm_config.macros.each do |name|
+              SPM::MacroPrebuilder.new(name: name).run
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+require "cocoapods-spm/command/macro/fetch"
+require "cocoapods-spm/command/macro/prebuild"
+require "cocoapods-spm/command/macro/deprecated"
+
+module Pod
+  class Command
+    class Spm < Command
+      class Macro < Spm
+        self.summary = "Working with macros"
+        self.abstract_command = true
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
-require "cocoapods-spm/command/prebuild"
-require "cocoapods-spm/command/fetch"
+require "cocoapods-spm/command/macro"
+require "cocoapods-spm/command/clean"
 
 module Pod
   class Command

data/lib/cocoapods-spm/compatibility/all.rb

@@ -0,0 +1 @@
+require_relative "rb26"

data/lib/cocoapods-spm/compatibility/rb26.rb

@@ -0,0 +1,14 @@
+module Enumerable
+  unless method_defined?(:filter_map)
+    def filter_map
+      return enum_for(:filter_map) unless block_given?
+
+      result = []
+      each do |element|
+        value = yield(element)
+        result << value if value
+      end
+      result
+    end
+  end
+end

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

@@ -58,19 +58,23 @@ module Pod
       end
 
       def macro_root_dir
-        root_dir # To be updated: rootdir / "macros"
+        @macro_root_dir ||= prepare_dir(root_dir / "macros")
       end
 
       def macro_downloaded_root_dir
         macro_root_dir / ".downloaded"
       end
 
+      def macro_prebuilt_root_dir
+        macro_root_dir / ".prebuilt"
+      end
+
       def macro_downloaded_sandbox
         @macro_downloaded_sandbox ||= Sandbox.new(macro_downloaded_root_dir)
       end
 
       def pkg_umbrella_dir
-        @pkg_umbrella_dir ||= prepare_dir(root_dir / ".umbrella")
+        @pkg_umbrella_dir ||= prepare_dir(pkg_root_dir / ".umbrella")
       end
 
       def pkg_checkouts_dir

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

@@ -18,7 +18,7 @@ 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)
+        requirements[0][:path] = prepare_macro_pod_dir(name, macro).to_s
         macro_pods[name] = macro
       end
       origin_pod(name, *requirements)
@@ -49,6 +49,10 @@ module Pod
       end
     end
 
+    def platforms
+      @platforms ||= target_definition_list.filter_map { |d| d.platform&.name }.uniq || [:ios]
+    end
+
     private
 
     def prepare_macro_pod_dir(name, requirement)
@@ -67,8 +71,7 @@ module Pod
         end
       HEREDOC
 
-      path = Pathname(".spm.pods/#{name}")
-      (path / ".prebuilt").mkpath
+      path = Pod::SPM::Config.instance.macro_root_dir / name
       (path / "Sources").mkpath
       (path / "#{name}.podspec").write(podspec_content)
       path

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

@@ -55,6 +55,10 @@ module Pod
         @linking_opts.fetch(:use_default_xcode_linking, false)
       end
 
+      def should_exclude_from_target?(target_name)
+        @linking_opts.fetch(:exclude_from_targets, []).include?(target_name.delete_prefix('Pods-'))
+      end
+
       def linker_flags
         @linking_opts[:linker_flags] || []
       end

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

@@ -0,0 +1,13 @@
+module Pod
+  module IOUtils
+    def self.symlink(src, dst)
+      # NOTE: File operations are case-insensitive (foo.json and Foo.json are identical)
+      return if File.identical?(src, dst)
+
+      src = Pathname.new(src) unless src.is_a?(Pathname)
+      dst = Pathname.new(dst) unless dst.is_a?(Pathname)
+      dst.delete if dst.exist?
+      File.symlink(src.absolute? ? src : src.realpath, dst)
+    end
+  end
+end

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

@@ -33,7 +33,7 @@ module Pod
 
         def add_spm_products_to_targets
           pods_project.targets.each do |target|
-            @spm_resolver.result.spm_dependencies_by_target[target.name].to_a.each do |dep|
+            @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

data/lib/cocoapods-spm/hooks/post_integrate/5.update_settings.rb

@@ -7,22 +7,21 @@ module Pod
       class UpdateSettings < Hook
         def run
           update_macro_plugin_flags
-          update_modulemap_flags
-          update_swift_include_paths
-          update_linker_flags
+          update_packages_flags
         end
 
         private
 
         def macro_plugin_flag_by_config
+          path_prefix = "${PODS_ROOT}/../#{spm_config.macro_prebuilt_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)
                 impl_module_name = metadata.macro_impl_name
                 plugin_executable_path =
-                  "${PODS_ROOT}/../.spm.pods/#{name}/.prebuilt/#{config.to_s.downcase}/" \
-                  "#{impl_module_name}##{impl_module_name}"
+                  "#{path_prefix}/#{name}/" \
+                  "#{impl_module_name}-#{config.to_s.downcase}##{impl_module_name}"
                 "-load-plugin-executable \"#{plugin_executable_path}\""
               end.join(" ")
               [config, flags]
@@ -42,27 +41,20 @@ module Pod
           )
         end
 
-        def update_modulemap_flags
-          perform_settings_update(
-            update_targets: lambda do |target, _, _|
-              {
-                "OTHER_SWIFT_FLAGS" => modulemap_args_for_target(target, prefix: "-Xcc"),
-                "OTHER_CFLAGS" => modulemap_args_for_target(target),
-              }
-            end
-          )
-        end
-
-        def update_linker_flags
+        def update_packages_flags
           return if @spm_resolver.result.spm_pkgs.empty?
 
-          # For packages to work in the main target
           perform_settings_update(
             update_targets: lambda do |target, _, _|
               {
-                "OTHER_LDFLAGS" => linker_flags_for(target),
+                "SOURCE_PACKAGES_CHECKOUTS_DIR" => "${BUILD_ROOT}/../../SourcePackages/checkouts",
                 "FRAMEWORK_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}/PackageFrameworks\"",
                 "LIBRARY_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}\"",
+                "SWIFT_INCLUDE_PATHS" => "$(PODS_CONFIGURATION_BUILD_DIR)",
+                "OTHER_SWIFT_FLAGS" => modulemap_args_for_target(target, prefix: "-Xcc"),
+                "OTHER_CFLAGS" => modulemap_args_for_target(target),
+                "HEADER_SEARCH_PATHS" => header_search_paths_for(target),
+                "OTHER_LDFLAGS" => linker_flags_for(target),
               }
             end
           )
@@ -74,16 +66,6 @@ module Pod
           @spm_resolver.result.linker_flags_for(target)
         end
 
-        def update_swift_include_paths
-          return if @spm_resolver.result.spm_pkgs.empty? && spm_config.all_macros.empty?
-
-          perform_settings_update(
-            update_targets: lambda do |_, _, _|
-              { "SWIFT_INCLUDE_PATHS" => "$(PODS_CONFIGURATION_BUILD_DIR)" }
-            end
-          )
-        end
-
         def modulemap_args_for_target(target, prefix: nil)
           @spm_resolver
             .result
@@ -92,6 +74,14 @@ module Pod
             .map { |v| prefix.nil? ? v : "#{prefix} #{v}" }
             .join(" ")
         end
+
+        def header_search_paths_for(target)
+          @spm_resolver
+            .result
+            .spm_targets_for(target)
+            .filter_map(&:header_search_path_arg)
+            .join(" ")
+        end
       end
     end
   end

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

@@ -26,7 +26,7 @@ module Pod
       end
 
       def macro_prebuilt_dir
-        macro_dir / ".prebuilt"
+        spm_config.macro_prebuilt_root_dir / name
       end
 
       def metadata_path
@@ -47,7 +47,8 @@ module Pod
 
         config = spm_config.macro_config
         impl_module_name = @metadata.macro_impl_name
-        return if spm_config.dont_prebuild_macros_if_exist? && (macro_prebuilt_dir / config / impl_module_name).exist?
+        prebuilt_binary = macro_prebuilt_dir / "#{impl_module_name}-#{config}"
+        return if spm_config.dont_prebuild_macros_if_exist? && prebuilt_binary.exist?
 
         UI.section "Building macro implementation: #{impl_module_name} (#{config})...".green do
           Dir.chdir(macro_downloaded_dir) do
@@ -55,10 +56,10 @@ module Pod
           end
         end
 
-        (macro_prebuilt_dir / config).mkpath
+        prebuilt_binary.parent.mkpath
         FileUtils.copy_entry(
           macro_downloaded_dir / ".build" / config / impl_module_name,
-          macro_prebuilt_dir / config / impl_module_name
+          prebuilt_binary
         )
       end
     end

data/lib/cocoapods-spm/main.rb

@@ -1,3 +1,6 @@
+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/target_definition"

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

@@ -28,7 +28,9 @@ module Pod
           @result.spm_dependencies_by_target.values.flatten.uniq(&:product).each do |dep|
             next if dep.pkg.use_default_xcode_linking?
 
-            project_pkgs.resolve_recursive_targets_of(dep.pkg.name, dep.product)
+            @podfile.platforms.each do |platform|
+              project_pkgs.resolve_recursive_targets_of(dep.pkg.name, dep.product, platform: platform)
+            end
           end
         end
       end

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

@@ -31,12 +31,15 @@ module Pod
         end
 
         def spm_dependencies_for(target)
-          @spm_dependencies_by_target[target.to_s].to_a
+          filtered_dependencies = @spm_dependencies_by_target[spec_name_of(target)]&.reject do |dep|
+            dep.pkg&.should_exclude_from_target?(target.name)
+          end
+          filtered_dependencies.to_a
         end
 
         def spm_targets_for(target, exclude_default_xcode_linking: true)
           targets = spm_dependencies_for(target).flat_map do |d|
-            project_pkgs.resolve_recursive_targets_of(d.pkg.name, d.product)
+            project_pkgs.resolve_recursive_targets_of(d.pkg.name, d.product, platform: target.platform.name)
           end.uniq(&:name)
           return targets.reject(&:use_default_xcode_linking?) if exclude_default_xcode_linking
 
@@ -49,6 +52,21 @@ module Pod
             spm_pkgs_for(target).flat_map(&:linker_flags)
           ).uniq
         end
+
+        private
+
+        def spec_name_of(target)
+          # In case of multi-platforms, the target name might contains the platform (ex. Logger-iOS, Logger-macOS)
+          # We need to strip the platform suffix out
+          return target.name if @spm_dependencies_by_target.key?(target.name)
+          return target.root_spec.name if target.is_a?(Pod::PodTarget)
+          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])
+
+          target.name
+        end
       end
     end
   end

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

@@ -16,7 +16,7 @@ module Pod
         private
 
         def resolve_spm_pkgs
-          @result.spm_pkgs = @podfile.target_definition_list.flat_map(&:spm_pkgs).uniq
+          @result.spm_pkgs = @podfile.target_definition_list.flat_map(&:spm_pkgs).uniq(&:name)
         end
 
         def resolve_spm_dependencies_by_target

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

@@ -5,7 +5,7 @@ module Pod
 
       def initialize(podfile)
         @podfile = podfile
-        @spm_pkgs = @podfile.target_definition_list.flat_map(&:spm_pkgs).uniq
+        @spm_pkgs = @podfile.target_definition_list.flat_map(&:spm_pkgs).uniq(&:name)
       end
 
       def prepare
@@ -56,10 +56,15 @@ module Pod
       end
 
       def create_symlinks_to_local_pkgs
-        @spm_pkgs.select(&:local?).each do |pkg|
-          dst_dir = spm_config.pkg_checkouts_dir / pkg.slug
-          dst_dir.delete if dst_dir.exist?
-          File.symlink(pkg.absolute_path, dst_dir)
+        local_spm_pkgs = @spm_pkgs.select(&:local?)
+        symlinks = local_spm_pkgs.to_h { |p| [p.slug, p.absolute_path] }
+        local_spm_pkgs.each do |pkg|
+          pkg_desc = Swift::PackageDescription.from_dir(pkg.absolute_path)
+          pkg_desc.dependencies.select(&:local?).each { |d| symlinks[d.slug] = d.path }
+        end
+
+        symlinks.each do |slug, src_dir|
+          IOUtils.symlink(src_dir, spm_config.pkg_checkouts_dir / slug)
         end
       end
     end

data/lib/cocoapods-spm/swift/package/dependency.rb

@@ -0,0 +1,27 @@
+require "cocoapods-spm/swift/package/base"
+
+module Pod
+  module Swift
+    class PackageDescription
+      class Dependency < PackageDescriptionBaseObject
+        def local?
+          raw.key?("fileSystem")
+        end
+
+        def slug
+          hash["identity"]
+        end
+
+        def path
+          hash["path"]
+        end
+
+        private
+
+        def hash
+          raw.values.flatten[0] || {}
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-spm/swift/package/description.rb

@@ -4,9 +4,15 @@ module Pod
   module Swift
     class PackageDescription < PackageDescriptionBaseObject
       include SPM::Config::Mixin
+      autoload :Dependency, "cocoapods-spm/swift/package/dependency"
       autoload :Target, "cocoapods-spm/swift/package/target"
       autoload :Product, "cocoapods-spm/swift/package/product"
 
+      def self.from_dir(dir)
+        raw = `swift package dump-package --package-path #{dir.shellescape}`
+        from_s(raw)
+      end
+
       def src_dir
         @src_dir ||= begin
           path = raw.fetch("packageKind", {}).fetch("root", [])[0]
@@ -14,6 +20,10 @@ module Pod
         end
       end
 
+      def checkouts_dir
+        src_dir.parent
+      end
+
       def artifacts_dir
         spm_config.pkg_artifacts_dir / slug
       end
@@ -22,12 +32,16 @@ module Pod
         src_dir.nil? ? name : src_dir.basename.to_s
       end
 
+      def dependencies
+        @dependencies ||= convert_field("dependencies", Dependency)
+      end
+
       def targets
-        @targets ||= raw.fetch("targets", []).flat_map { |h| Target.new(h, parent: self) }
+        @targets ||= convert_field("targets", Target)
       end
 
       def products
-        @products ||= raw.fetch("products", []).flat_map { |h| Product.new(h, parent: nil) }
+        @products ||= convert_field("products", Product)
       end
 
       def targets_of_product(name)
@@ -51,6 +65,12 @@ module Pod
         pkg = pod_config.podfile.spm_pkgs.find { |t| t.name == name }
         @use_default_xcode_linking = pkg&.use_default_xcode_linking?
       end
+
+      private
+
+      def convert_field(name, type)
+        raw.fetch(name, []).flat_map { |h| type.new(h, parent: self) }
+      end
     end
   end
 end

data/lib/cocoapods-spm/swift/package/project_packages.rb

@@ -12,18 +12,21 @@ module Pod
         load
       end
 
-      def resolve_recursive_targets_of(pkg_name, product_name)
+      def resolve_recursive_targets_of(pkg_name, product_name, platform: nil)
         @recursive_targets_cache ||= {}
-        return @recursive_targets_cache[product_name] if @recursive_targets_cache.key(product_name)
+        @recursive_targets_cache[platform] ||= {}
+        return @recursive_targets_cache[platform][product_name] if @recursive_targets_cache[platform].key(product_name)
 
         res = []
         to_visit = pkg_desc_of(pkg_name).targets_of_product(product_name)
         until to_visit.empty?
           target = to_visit.pop
           res << target
-          to_visit += target.resolve_dependencies(@pkg_desc_cache)
+          # Exclude macros as they wont be linked to the project's binary
+          # https://github.com/trinhngocthuyen/cocoapods-spm/issues/107
+          to_visit += target.resolve_dependencies(@pkg_desc_cache, platform: platform).reject(&:macro?)
         end
-        @recursive_targets_cache[product_name] = res.uniq(&:name)
+        @recursive_targets_cache[platform][product_name] = res.uniq(&:name)
       end
 
       def pkg_desc_of(name)
@@ -38,17 +41,17 @@ module Pod
         @src_dir.glob("*").each do |dir|
           next if dir.glob("Package*.swift").empty?
 
-          raw = Dir.chdir(dir) { `swift package dump-package` }
-          pkg_desc = PackageDescription.from_s(raw)
-          write_data = lambda do |name|
-            @pkg_desc_cache[name] = pkg_desc
-            (@json_dir / "#{name}.json").write(raw) unless @json_dir.nil?
-          end
-
-          pkg_name = pkg_desc.name
-          pkg_slug = dir.basename.to_s
-          write_data.call(pkg_name)
-          write_data.call(pkg_slug) unless pkg_name == pkg_slug
+          pkg_desc = PackageDescription.from_dir(dir)
+          name = pkg_desc.name
+          slug = dir.basename.to_s
+          @pkg_desc_cache[name] = pkg_desc
+          @pkg_desc_cache[slug] = pkg_desc
+          next if @json_dir.nil?
+
+          json_path = @json_dir / "#{name}.json"
+          slug_json_path = @json_dir / "#{slug}.json"
+          json_path.write(pkg_desc.raw.to_json)
+          IOUtils.symlink(json_path, slug_json_path) unless name == slug
         end
       end
     end

data/lib/cocoapods-spm/swift/package/target.rb

@@ -28,18 +28,66 @@ module Pod
           @product_name || name
         end
 
+        def sources_path
+          @sources_path ||= begin
+            path = raw["path"] || "Sources/#{name}"
+            root.src_dir / path
+          end
+        end
+
+        def header_search_path_arg
+          return nil if public_headers_path.nil?
+
+          path = public_headers_path.to_s.sub(root.checkouts_dir.to_s, "${SOURCE_PACKAGES_CHECKOUTS_DIR}")
+          "\"#{path}\""
+        end
+
         def public_headers_path
-          raw["publicHeadersPath"]
+          res = sources_path / raw["publicHeadersPath"] if raw.key?("publicHeadersPath")
+          res = implicit_public_headers if res.nil?
+          res
+        end
+
+        def implicit_public_headers
+          path = sources_path / "include"
+          path unless path.glob("**/*.h*").empty?
+        end
+
+        def use_generated_modulemap?
+          return false if public_headers_path.nil?
+
+          # If there exists module.modulemap, it'll be auto picked up during compilation
+          true if public_headers_path.glob("module.modulemap").empty?
         end
 
         def clang_modulemap_arg
-          return nil if public_headers_path.nil?
+          return nil unless use_generated_modulemap?
 
           "-fmodule-map-file=\"${GENERATED_MODULEMAP_DIR}/#{name}.modulemap\""
         end
 
         def resources
-          raw.fetch("resources", []).flat_map { |h| Resources.new(h, parent: self) }
+          res = raw.fetch("resources", []).flat_map { |h| Resources.new(h, parent: self) }
+          res = implicit_resources if res.empty?
+          res
+        end
+
+        def implicit_resources
+          target_sources_path = raw["path"] || "Sources/#{name}"
+          target_sources_path = root.src_dir / target_sources_path
+
+          # Refer to the following link for the implicit resources
+          # https://developer.apple.com/documentation/xcode/bundling-resources-with-a-swift-package#Add-resource-files
+          patterns = [
+            "*.xcassets",
+            "*.xib",
+            "*.storyboard",
+            "*.xcdatamodeld",
+            "*.lproj",
+          ]
+          return [] if patterns.all? { |p| target_sources_path.glob(p).empty? }
+
+          [Resources.new({}, parent: self)]
         end
 
         def linker_flags
@@ -48,18 +96,19 @@ module Pod
 
           case binary_basename
           when /(\S+)\.framework/ then ["-framework \"#{$1}\""]
-          when /lib(\S+)\.a/ then ["-library \"#{$1}\""]
-          when /(\S+\.a)/ then ["\"${PODS_CONFIGURATION_BUILD_DIR}/#{$1}\""]
+          when /lib(\S+)\.(a|dylib)/ then ["-l\"#{$1}\""]
+          when /(\S+\.(a|dylib))/ then ["\"${PODS_CONFIGURATION_BUILD_DIR}/#{$1}\""]
           else []
           end
         end
 
-        def resolve_dependencies(pkg_desc_cache)
+        def resolve_dependencies(pkg_desc_cache, platform: nil)
           raw.fetch("dependencies", []).flat_map do |hash|
             type = ["byName", "target", "product"].find { |k| hash.key?(k) }
             if type.nil?
               raise Informative, "Unexpected dependency type. Must be either `byName`, `target`, or `product`."
             end
+            next [] unless match_platform?(hash[type][-1], platform)
 
             name = hash[type][0]
             pkg_name = hash.key?("product") ? hash["product"][1] : self.pkg_name
@@ -78,11 +127,21 @@ module Pod
           "${BUILT_PRODUCTS_DIR}/PackageFrameworks/#{framework_name}.framework"
         end
 
+        def xcframework
+          @xcframework ||= begin
+            path = (root.artifacts_dir / name).glob("*.xcframework")[0]
+            Xcode::XCFramework.new(name, path.realpath) unless path.nil?
+          end
+        end
+
         def binary_basename
           return nil unless binary?
 
           @binary_basename ||= begin
-            paths = (root.artifacts_dir / name).glob("*.xcframework/*/*.{a,framework}")
+            xcframework_dir ||= (root.artifacts_dir / name).glob("*.xcframework")[0]
+            xcframework_dir ||= root.src_dir / raw["path"] if raw.key?("path")
+            paths = xcframework_dir.glob("*/*.{a,framework}")
+            UI.warn "Cannot detect binary_basename for #{name}" if paths.empty?
             paths[0].basename.to_s unless paths.empty?
           end
         end
@@ -90,6 +149,17 @@ module Pod
         def use_default_xcode_linking?
           root.use_default_xcode_linking?
         end
+
+        private
+
+        def match_platform?(condition, platform)
+          # Consider matching if there's no condition
+          return true if condition.nil? || !condition.key?("platformNames")
+
+          # macos is called osx in Cocoapods.
+          platform_name = platform.to_s == 'osx' ? 'macos' : platform.to_s
+          condition["platformNames"].include?(platform_name)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-spm
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Thuyen Trinh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-25 00:00:00.000000000 Z
+date: 2024-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -32,9 +32,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/cocoapods-spm.rb
-- lib/cocoapods-spm/command/fetch.rb
-- lib/cocoapods-spm/command/prebuild.rb
+- lib/cocoapods-spm/command/clean.rb
+- lib/cocoapods-spm/command/macro.rb
+- lib/cocoapods-spm/command/macro/deprecated.rb
+- lib/cocoapods-spm/command/macro/fetch.rb
+- lib/cocoapods-spm/command/macro/prebuild.rb
 - lib/cocoapods-spm/command/spm.rb
+- lib/cocoapods-spm/compatibility/all.rb
+- lib/cocoapods-spm/compatibility/rb26.rb
 - lib/cocoapods-spm/config.rb
 - lib/cocoapods-spm/config/pod.rb
 - lib/cocoapods-spm/config/project.rb
@@ -46,6 +51,7 @@ files:
 - lib/cocoapods-spm/def/target_definition.rb
 - lib/cocoapods-spm/def/xcodeproj.rb
 - lib/cocoapods-spm/executables.rb
+- lib/cocoapods-spm/helpers/io.rb
 - lib/cocoapods-spm/helpers/patch.rb
 - lib/cocoapods-spm/hooks/base.rb
 - lib/cocoapods-spm/hooks/helpers/update_script.rb
@@ -67,6 +73,7 @@ files:
 - lib/cocoapods-spm/resolver/umbrella_package.rb
 - lib/cocoapods-spm/resolver/validator.rb
 - lib/cocoapods-spm/swift/package/base.rb
+- lib/cocoapods-spm/swift/package/dependency.rb
 - lib/cocoapods-spm/swift/package/description.rb
 - lib/cocoapods-spm/swift/package/product.rb
 - lib/cocoapods-spm/swift/package/project_packages.rb

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

@@ -1,31 +0,0 @@
-require "cocoapods-spm/macro/fetcher"
-
-module Pod
-  class Command
-    class Spm < Command
-      class Fetch < Spm
-        self.summary = "Fetch macros"
-        def self.options
-          [
-            ["--all", "Prebuild all macros"],
-            ["--macros=foo", "Macros to prebuild, separated by comma (,)"],
-          ].concat(super)
-        end
-
-        def initialize(argv)
-          super
-          update_cli_config(
-            all: argv.flag?("all"),
-            macros: argv.option("macros", "").split(",")
-          )
-        end
-
-        def run
-          spm_config.macros.each do |name|
-            SPM::MacroFetcher.new(name: name, can_cache: true).run
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,35 +0,0 @@
-require "cocoapods-spm/macro/prebuilder"
-
-module Pod
-  class Command
-    class Spm < Command
-      class Prebuild < Spm
-        self.summary = "Prebuild macros"
-        def self.options
-          [
-            ["--all", "Prebuild all macros"],
-            ["--macros=foo", "Macros to prebuild, separated by comma (,)"],
-            ["--config=foo", "Config (debug/release) to prebuild macros"],
-          ].concat(super)
-        end
-
-        def initialize(argv)
-          super
-          update_cli_config(
-            all: argv.flag?("all"),
-            macros: argv.option("macros", "").split(","),
-            config: argv.option("config"),
-            dont_prebuild_macros: false,
-            dont_prebuild_macros_if_exist: false
-          )
-        end
-
-        def run
-          spm_config.macros.each do |name|
-            SPM::MacroPrebuilder.new(name: name).run
-          end
-        end
-      end
-    end
-  end
-end