cocoapods-spm 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1e1e2bd492fb8080c1d1d0ab60b4abe580d3540559ba11085b0b2a93826de54
-  data.tar.gz: 1a30fc92b2e7cdc5082f6fea26635f55345a9ae08d835450e66041028b862036
+  metadata.gz: bbcb911c20a1ba82d17dce1be6e78b74e4a1d8e2b32d60e38363ea67cbe4f8a8
+  data.tar.gz: 9b15453f318dec4cd6d54119e8245023a200befa673e490a35f59b6768015c40
 SHA512:
-  metadata.gz: f7941760c3ec1e4be209ba35108e80db527218f6862f1fd4ffa87cbfde60688bd9e1aa735193f2018abd77593d0e8c47bfe652a60c577391a758cff7b47c8ccb
-  data.tar.gz: 21df8075d35796d309ed868cbfe7f07b53c57c325c3e3a298b7eabab3239d658805a54d291ed6f9fdf3bc06605210940f55f636c6e362e1932e828e72ad77985
+  metadata.gz: 209616fc087b99e98a39356f06a458190ba59d5e9272355dcaa3caa0fd312557a159a0c7e2bd159ea1cd420aff8f1c206c124a328b6cd7b7be40c656343fff14
+  data.tar.gz: d7dd3483408ec69e18e4bebd8a8a7055ddd570f9ddd878e6e7b82d99c84914476a89e1a2cb05f29880904aa6823bbf074e83d8ccc52bbcd0eca3f5a0f6792978

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

@@ -0,0 +1,7 @@
+module Pod
+  class Installer
+    def native_targets
+      pods_project.targets + pod_target_subprojects.flat_map(&:targets)
+    end
+  end
+end

data/lib/cocoapods-spm/hooks/base.rb

@@ -30,6 +30,14 @@ module Pod
         @analysis_result.targets
       end
 
+      def pod_target_subprojects
+        @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

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

@@ -8,37 +8,21 @@ module Pod
         def run
           return if @spm_resolver.result.spm_pkgs.empty?
 
-          add_spm_pkg_refs_to_project
-          add_spm_products_to_targets
-          pods_project.save
-        end
-
-        private
-
-        def spm_pkg_refs
-          @spm_pkg_refs ||= {}
-        end
-
-        def add_spm_pkg_refs_to_project
-          @spm_pkg_refs = @spm_resolver.result.spm_pkgs.to_h do |pkg|
-            pkg_ref = pkg.create_pkg_ref(pods_project)
-            pods_project.root_object.package_references << pkg_ref
-            [pkg.name, pkg_ref]
-          end
-        end
-
-        def spm_pkgs_by_target
-          @spm_pkgs_by_target ||= {}
-        end
-
-        def add_spm_products_to_targets
-          pods_project.targets.each do |target|
-            @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
-              target.package_product_dependencies << target_dep_ref.product_ref if dep.pkg.use_default_xcode_linking?
+          projects_to_integrate.compact.each do |project|
+            spm_pkg_refs = {}
+            project.targets.each do |target|
+              @spm_resolver.result.spm_dependencies_for(target).each do |dep|
+                pkg_ref = dep.pkg.create_pkg_ref(project)
+                target_dep_ref = pkg_ref.create_target_dependency_ref(dep.product)
+                target.dependencies << target_dep_ref
+                target.package_product_dependencies << target_dep_ref.product_ref if dep.pkg.use_default_xcode_linking?
+                spm_pkg_refs.store(dep.pkg.name, pkg_ref)
+              end
+            end
+            spm_pkg_refs.each_value do |pkg_ref|
+              project.root_object.package_references << pkg_ref
             end
+            project.save
           end
         end
       end

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

@@ -0,0 +1,27 @@
+module Pod
+  module SPM
+    module MacroConfigMixin
+      include Config::Mixin
+
+      def macro_downloaded_dir
+        spm_config.macro_downloaded_root_dir / name
+      end
+
+      def macro_dir
+        @macro_dir ||= spm_config.macro_root_dir / name
+      end
+
+      def macro_prebuilt_dir
+        spm_config.macro_prebuilt_root_dir / name
+      end
+
+      def metadata_path
+        macro_dir / "metadata.json"
+      end
+
+      def metadata
+        @metadata ||= MacroMetadata.for_pod(name)
+      end
+    end
+  end
+end

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

@@ -1,7 +1,10 @@
+require "cocoapods-spm/macro/metadata"
+require_relative "config"
+
 module Pod
   module SPM
     class MacroFetcher
-      include Config::Mixin
+      include MacroConfigMixin
 
       attr_reader :name
 
@@ -13,6 +16,7 @@ module Pod
       end
 
       def run
+        UI.puts "Fetching macro #{name}...".magenta
         download_macro_source
         macro_dir = spm_config.macro_root_dir / name
         macro_downloaded_dir = spm_config.macro_downloaded_root_dir / name
@@ -20,6 +24,17 @@ module Pod
           macro_downloaded_dir / "Sources" / name,
           macro_dir / "Sources" / name
         )
+        generate_metadata
+      end
+
+      private
+
+      def generate_metadata
+        raise "Package.swift not exist in #{macro_downloaded_dir}" \
+          unless (macro_downloaded_dir / "Package.swift").exist?
+
+        raw = Dir.chdir(macro_downloaded_dir) { `swift package dump-package` }
+        metadata_path.write(raw)
       end
 
       def download_macro_source

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

@@ -4,7 +4,13 @@ module Pod
   module SPM
     class MacroMetadata < Swift::PackageDescription
       def self.for_pod(name)
-        from_file(Config.instance.macro_root_dir / name / "metadata.json")
+        path = Config.instance.macro_root_dir / name / "metadata.json"
+        unless path.exist?
+          UI.message "Will fetch macro #{name} because its metadata does not exist at #{path}"
+          require "cocoapods-spm/macro/fetcher"
+          MacroFetcher.new(name: name, can_cache: true).run
+        end
+        from_file(path)
       end
     end
   end

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

@@ -1,9 +1,10 @@
 require "cocoapods-spm/macro/metadata"
+require_relative "config"
 
 module Pod
   module SPM
     class MacroPrebuilder
-      include Config::Mixin
+      include MacroConfigMixin
       include Executables
 
       attr_reader :name
@@ -13,40 +14,14 @@ module Pod
       end
 
       def run
-        generate_metadata
         prebuild_macro_impl
       end
 
-      def macro_downloaded_dir
-        spm_config.macro_downloaded_root_dir / name
-      end
-
-      def macro_dir
-        @macro_dir ||= spm_config.macro_root_dir / name
-      end
-
-      def macro_prebuilt_dir
-        spm_config.macro_prebuilt_root_dir / name
-      end
-
-      def metadata_path
-        macro_dir / "metadata.json"
-      end
-
-      def generate_metadata
-        raise "Package.swift not exist in #{macro_downloaded_dir}" \
-          unless (macro_downloaded_dir / "Package.swift").exist?
-
-        raw = Dir.chdir(macro_downloaded_dir) { `swift package dump-package` }
-        metadata_path.write(raw)
-        @metadata = MacroMetadata.from_s(raw)
-      end
-
       def prebuild_macro_impl
         return if spm_config.dont_prebuild_macros?
 
         config = spm_config.macro_config
-        impl_module_name = @metadata.macro_impl_name
+        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?
 

data/lib/cocoapods-spm/main.rb

@@ -3,6 +3,7 @@ require "cocoapods-spm/helpers/io"
 require "cocoapods-spm/helpers/patch"
 require "cocoapods-spm/config"
 require "cocoapods-spm/executables"
+require "cocoapods-spm/def/installer"
 require "cocoapods-spm/def/target_definition"
 require "cocoapods-spm/def/podfile"
 require "cocoapods-spm/def/spec"

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

@@ -35,11 +35,15 @@ module Pod
           end
         end
 
-        def header_search_path_arg
-          return nil if public_headers_path.nil?
+        def public_headers_path_expr
+          @public_headers_path_expr ||= public_headers_path.to_s.sub(
+            root.checkouts_dir.to_s,
+            "${SOURCE_PACKAGES_CHECKOUTS_DIR}"
+          )
+        end
 
-          path = public_headers_path.to_s.sub(root.checkouts_dir.to_s, "${SOURCE_PACKAGES_CHECKOUTS_DIR}")
-          "\"#{path}\""
+        def header_search_path_arg
+          "\"#{public_headers_path_expr}\"" unless public_headers_path.nil?
         end
 
         def public_headers_path
@@ -53,17 +57,18 @@ module Pod
           path unless path.glob("**/*.h*").empty?
         end
 
-        def use_generated_modulemap?
-          return false if public_headers_path.nil?
+        def modulemap_path
+          @modulemap_path ||= public_headers_path&.glob("*.modulemap")&.first
+        end
+
+        def clang_modulemap_path_expr
+          return "#{public_headers_path_expr}/#{modulemap_path.basename}" unless modulemap_path.nil?
 
-          # If there exists module.modulemap, it'll be auto picked up during compilation
-          true if public_headers_path.glob("module.modulemap").empty?
+          "${GENERATED_MODULEMAP_DIR}/#{name}.modulemap" unless binary?
         end
 
         def clang_modulemap_arg
-          return nil unless use_generated_modulemap?
-
-          "-fmodule-map-file=\"${GENERATED_MODULEMAP_DIR}/#{name}.modulemap\""
+          "-fmodule-map-file=\"#{clang_modulemap_path_expr}\"" unless clang_modulemap_path_expr.nil?
         end
 
         def resources

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-spm
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Thuyen Trinh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-18 00:00:00.000000000 Z
+date: 2024-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -44,6 +44,7 @@ files:
 - lib/cocoapods-spm/config/pod.rb
 - lib/cocoapods-spm/config/project.rb
 - lib/cocoapods-spm/config/spm.rb
+- lib/cocoapods-spm/def/installer.rb
 - lib/cocoapods-spm/def/podfile.rb
 - lib/cocoapods-spm/def/spec.rb
 - lib/cocoapods-spm/def/spm_dependency.rb
@@ -59,6 +60,7 @@ files:
 - 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/macro/config.rb
 - lib/cocoapods-spm/macro/fetcher.rb
 - lib/cocoapods-spm/macro/metadata.rb
 - lib/cocoapods-spm/macro/pod_installer.rb