cocoapods-spm 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43e96257dc89796c000a5115e81d36fc9ef9df8208eba676a2fd1b6961864b84
-  data.tar.gz: 1aafa45b40759edbcb3e3ceee7a699038ca2638f8d6c432bd8a4dce2a5321783
+  metadata.gz: 7d90d3841df89cb8d7eb74c8ad184992ae08ec0ed58581827bae94fecdbb9d71
+  data.tar.gz: 90220d0a9b57102775d8819e972098f5d43a8ddb367e091f1963fe24fead0232
 SHA512:
-  metadata.gz: c6673bab5c9be9aef9834c835fa6f732e7107cd19dedee9fade7674a11da5e08a59456e829a867e5dc5bc683a7506009bd947178f3b1184ed4e2d8f3100798e8
-  data.tar.gz: db59493b90243638c878ed6d9140155c9059f147ee3dda1c826ea2d2c0739329d10ddf2e5c6c5b53968b6cb85ba9159421e3405fae66d5f2ba340869f13bf5cf
+  metadata.gz: e67677e877f86e94e159630506ab0638429f374cb2aeed940630db7c0b05450ac40cc23fc21868caeef91be9c2c5feed11b61d4e1d2d2f23383da6329d3a1f7c
+  data.tar.gz: cb91b35ceff530f2b475ab25a5a645cc4e9622401de79064cf0841403135c83aa440265803b7c9520931dd37d18745be7a9dcda7f030a6cfdc36000d79f30279

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

@@ -2,69 +2,67 @@ require "cocoapods-spm/config"
 
 module Pod
   class Podfile
-    module DSL
-      attr_accessor :spm_analyzer
+    attr_accessor :spm_analyzer
 
-      alias origin_pod pod
-      def config_cocoapods_spm(options)
-        SPM::Config.instance.dsl_config = options
-      end
+    alias origin_pod pod
+    def config_cocoapods_spm(options)
+      SPM::Config.instance.dsl_config = options
+    end
 
-      def macro_pods
-        @macro_pods ||= {}
-      end
+    def macro_pods
+      @macro_pods ||= {}
+    end
 
-      def pod(name = nil, *requirements)
-        macro = requirements[0].delete(:macro) if requirements.first.is_a?(Hash)
-        macro ||= {}
-        unless macro.empty?
-          requirements[0][:path] = prepare_macro_pod_dir(name, macro)
-          macro_pods[name] = macro
-        end
-        origin_pod(name, *requirements)
+    def pod(name = nil, *requirements)
+      macro = requirements[0].delete(:macro) if requirements.first.is_a?(Hash)
+      macro ||= {}
+      unless macro.empty?
+        requirements[0][:path] = prepare_macro_pod_dir(name, macro)
+        macro_pods[name] = macro
       end
+      origin_pod(name, *requirements)
+    end
 
-      def spm_pkg(name, options)
-        current_target_definition.store_spm_pkg(name, options)
-      end
+    def spm_pkg(name, options)
+      current_target_definition.store_spm_pkg(name, options)
+    end
 
-      def spm_pkgs_for(target)
-        spm_pkgs_by_aggregate_target[target.to_s]
-      end
+    def spm_pkgs_for(target)
+      spm_pkgs_by_aggregate_target[target.to_s]
+    end
 
-      def spm_pkgs_by_aggregate_target
-        @spm_pkgs_by_aggregate_target ||= begin
-          common_spm_pkgs = root_target_definitions.flat_map(&:spm_pkgs)
-          target_definition_list.reject(&:abstract?).to_h do |target|
-            [target.to_s, (common_spm_pkgs + target.spm_pkgs).uniq(&:name)]
-          end
+    def spm_pkgs_by_aggregate_target
+      @spm_pkgs_by_aggregate_target ||= begin
+        common_spm_pkgs = root_target_definitions.flat_map(&:spm_pkgs)
+        target_definition_list.reject(&:abstract?).to_h do |target|
+          [target.to_s, (common_spm_pkgs + target.spm_pkgs).uniq(&:name)]
         end
       end
+    end
 
-      private
+    private
 
-      def prepare_macro_pod_dir(name, requirement)
-        link = requirement[:git]
-        podspec_content = <<~HEREDOC
-          Pod::Spec.new do |s|
-            s.name = "#{name}"
-            s.version = "0.0.1"
-            s.summary = "#{name}"
-            s.description = "#{name}"
-            s.homepage = "#{link}"
-            s.license = "MIT"
-            s.authors = "dummy@gmail.com"
-            s.source = #{requirement}
-            s.source_files = "Sources/**/*"
-          end
-        HEREDOC
+    def prepare_macro_pod_dir(name, requirement)
+      link = requirement[:git]
+      podspec_content = <<~HEREDOC
+        Pod::Spec.new do |s|
+          s.name = "#{name}"
+          s.version = "0.0.1"
+          s.summary = "#{name}"
+          s.description = "#{name}"
+          s.homepage = "#{link}"
+          s.license = "MIT"
+          s.authors = "dummy@gmail.com"
+          s.source = #{requirement}
+          s.source_files = "Sources/**/*"
+        end
+      HEREDOC
 
-        path = Pathname(".spm.pods/#{name}")
-        (path / ".prebuilt").mkpath
-        (path / "Sources").mkpath
-        (path / "#{name}.podspec").write(podspec_content)
-        path
-      end
+      path = Pathname(".spm.pods/#{name}")
+      (path / ".prebuilt").mkpath
+      (path / "Sources").mkpath
+      (path / "#{name}.podspec").write(podspec_content)
+      path
     end
   end
 end

data/lib/cocoapods-spm/hooks/pre_integrate/update_settings.rb

@@ -48,7 +48,11 @@ module Pod
           # For packages to work in the main target
           perform_settings_update(
             update_targets: lambda do |target, _, _|
-              { "OTHER_LDFLAGS" => linker_flags_for(target) }
+              {
+                "OTHER_LDFLAGS" => linker_flags_for(target),
+                "FRAMEWORK_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}/PackageFrameworks\"",
+                "LIBRARY_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}\""
+              }
             end
           )
         end
@@ -56,9 +60,7 @@ module Pod
         def linker_flags_for(target)
           spm_deps = @spm_analyzer.spm_dependencies_by_target[target.to_s].to_a
           framework_flags = spm_deps.select(&:dynamic?).map { |d| "-framework \"#{d.product}\"" }
-          framework_flags << '-F"${PODS_CONFIGURATION_BUILD_DIR}/PackageFrameworks"' unless framework_flags.empty?
           library_flags = spm_deps.reject(&:dynamic?).map { |d| "-l\"#{d.product}.o\"" }
-          library_flags << '-L"${PODS_CONFIGURATION_BUILD_DIR}"' unless library_flags.empty?
           framework_flags + library_flags
         end
 
@@ -68,7 +70,7 @@ module Pod
           # For macro packages
           perform_settings_update(
             update_targets: lambda do |_, _, _|
-              { "SWIFT_INCLUDE_PATHS" => "${SYMROOT}/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}" }
+              { "SWIFT_INCLUDE_PATHS" => "$(PODS_CONFIGURATION_BUILD_DIR)" }
             end
           )
         end

data/lib/cocoapods-spm/patch/aggregate_target.rb

@@ -7,7 +7,7 @@ module Pod
     end
 
     def includes_dynamic_spm_dependencies?
-      podfile.spm_analyzer.spm_dependencies_for(self).any?(&:dynamic)
+      podfile.spm_analyzer.spm_dependencies_for(self).any?(&:dynamic?)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-spm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Thuyen Trinh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-22 00:00:00.000000000 Z
+date: 2023-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj