cocoapods-spm 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82ee497116a843f58d7c720e348099991ffa073f2666496fab41c807197c8e60
-  data.tar.gz: c057825ee4c7e194d2a45c76373e280090fd175611be45dc456d756cb5997f1f
+  metadata.gz: b31c9b35087187bc68aa7537abeb5fec4fb45e496c767382b8b8300ebadebf30
+  data.tar.gz: fa9dcb1a770f7aeb42db04739bc81ae9ff52c9e0fffe0368e7769f36e1b99977
 SHA512:
-  metadata.gz: 682233630b82af675249d02cebbb97df63887741b27b0c2036ca05d3b762f3ea8e9c58020dca8a09c58889e907e33d3316c8565ee9c102b7d27b0b6cf6f86fe3
-  data.tar.gz: '070698bb276319f11d4a133276cc3b4e4694770f07bfc52c946409130f4b0b22516f500e00294a6185b6e4edbc62b25fe3cc6b5be6b841dda824036a8cb41efb'
+  metadata.gz: e644e4b8ba131f6eac0694ee25548e85f0782fadc794d68c944a18c969671f175aa14baaa0928b31cbbdbea0a8b3e14cd8ca01fb78022d8b4db1a66f676758e7
+  data.tar.gz: ea77387bf7c1e8ecb35fc00693450d0456b3535490561c4012397ab347127381719038d3ce6de88b529ba3966645d40d9d42adc8e5481763006f731f0c4e82d2

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

@@ -62,6 +62,9 @@ module Pod
           hash = update.call(target, setting, config)
           setting.xcconfig.merge!(hash)
           setting.generate.merge!(hash)
+          Installer::Xcode::PodsProjectGenerator::TargetInstallerHelper.update_changed_file(
+            setting, target.xcconfig_path(config)
+          )
         end
 
         pod_targets.each do |target|

data/lib/cocoapods-spm/hooks/{pre_integrate → post_integrate}/update_settings.rb

@@ -32,7 +32,7 @@ module Pod
         end
 
         def update_other_swift_flags
-          return unless spm_config.macros
+          return if spm_config.all_macros.empty?
 
           # For prebuilt macros
           perform_settings_update(
@@ -43,7 +43,7 @@ module Pod
         end
 
         def update_linker_flags
-          return unless @spm_analyzer.spm_pkgs
+          return if @spm_analyzer.spm_pkgs.empty?
 
           # For packages to work in the main target
           perform_settings_update(
@@ -65,7 +65,7 @@ module Pod
         end
 
         def update_swift_include_paths
-          return unless @spm_analyzer.spm_pkgs
+          return if @spm_analyzer.spm_pkgs.empty?
 
           # For macro packages
           perform_settings_update(

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

@@ -1,3 +1,5 @@
+require "cocoapods-spm/installer/validator"
+
 module Pod
   class Installer
     class SPMAnalyzer
@@ -13,6 +15,7 @@ module Pod
       def analyze
         analyze_spm_pkgs
         analyze_spm_dependencies_by_target
+        validate!
       end
 
       def spm_dependencies_for(target)
@@ -64,6 +67,11 @@ module Pod
         @_spm_pkgs_by_name ||= @spm_pkgs.to_h { |pkg| [pkg.name, pkg] }
         @_spm_pkgs_by_name[name]
       end
+
+      def validate!
+        validator = SPMValidator.new(@aggregate_targets, @spm_pkgs, @spm_dependencies_by_target)
+        validator.validate!
+      end
     end
   end
 end

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

@@ -0,0 +1,32 @@
+module Pod
+  class Installer
+    class SPMValidator
+      def initialize(aggregate_targets, spm_pkgs, spm_dependencies_by_target)
+        @aggregate_targets = aggregate_targets
+        @spm_pkgs = spm_pkgs
+        @spm_dependencies_by_target = spm_dependencies_by_target
+      end
+
+      def validate!
+        verify_no_missing_pkgs
+      end
+
+      private
+
+      def dependents_of_pkg(name)
+        @specs ||= @aggregate_targets.flat_map(&:specs).uniq
+        @specs.select { |s| s.spm_dependencies.any? { |d| d.name == name } }.map(&:name)
+      end
+
+      def verify_no_missing_pkgs
+        missing_pkgs = @spm_dependencies_by_target.values.flatten.select { |d| d.pkg.nil? }.map(&:name).uniq
+        return if missing_pkgs.empty?
+
+        messages = ["The following packages were not declared in Podfile:"]
+        messages += missing_pkgs.map { |pkg| "  • #{pkg}: used by #{dependents_of_pkg(pkg).join(', ')}" }
+        messages << "Use the `spm_pkg` method to declare those packages in Podfile."
+        raise Informative, messages.join("\n")
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-spm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Thuyen Trinh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-30 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -46,8 +46,9 @@ files:
 - lib/cocoapods-spm/hooks/base.rb
 - lib/cocoapods-spm/hooks/post_integrate/add_spm_pkgs.rb
 - lib/cocoapods-spm/hooks/post_integrate/update_embed_frameworks_script.rb
-- lib/cocoapods-spm/hooks/pre_integrate/update_settings.rb
+- lib/cocoapods-spm/hooks/post_integrate/update_settings.rb
 - lib/cocoapods-spm/installer/analyzer.rb
+- lib/cocoapods-spm/installer/validator.rb
 - lib/cocoapods-spm/macro/fetcher.rb
 - lib/cocoapods-spm/macro/pod_installer.rb
 - lib/cocoapods-spm/macro/prebuilder.rb
@@ -75,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: CocoaPods plugin to add SPM dependencies to CocoaPods targets