dependabot-swift 0.362.0 → 0.364.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67e00807463f4d247f07a3a309aa428d134b2dc84c7b5ce6eb436936bffa8857
-  data.tar.gz: 37ed2732d77212af197ce95a2ab634557a73e1970561d51f6aa1ed5ba392858f
+  metadata.gz: 363036340485e20146d3722b2d6e5636fa4c0ff007002301ebc72fdda60a9014
+  data.tar.gz: 5d938a9377d8900d3d422c76e66d6955787f40d6d39ec7f7c1fd6bc8123d374c
 SHA512:
-  metadata.gz: 928902c22e3744273fb6f80fc9e260ecbda4826280d0c2416b40c664f095dbd04b6544f1905fd582da3eeb9d72017c768e7ef45b69f8d05a396a1bbd178621e6
-  data.tar.gz: 6f4f5092f73a5f7faf8a3a402d71fa5d0d0e161c3bbf784445b357a3f7a02993155d1cb9ca9d2e02cef4a7e194e7e8998718c8724b75d6b8effc3813b906cae3
+  metadata.gz: 9bc68ec95a147b232bf55779657fd7ce94e3d957a8f483ba5596bcb1cfd5c950daf1f25718aa1bee501c9cfeff07fb1434ac766b4702d38f2930012ce1d18438
+  data.tar.gz: c44d03021e516a1b6e854cfece42f3de2ad37543f4634774447db6943e9ae217e2118212baad943fd18ed475c20d0e9142aca4b81629f17908298ca104260b7e

data/lib/dependabot/swift/file_fetcher.rb

@@ -1,7 +1,8 @@
-# typed: strong
+# typed: strict
 # frozen_string_literal: true
 
 require "sorbet-runtime"
+require "dependabot/experiments"
 require "dependabot/file_fetchers"
 require "dependabot/file_fetchers/base"
 
@@ -10,34 +11,79 @@ module Dependabot
     class FileFetcher < Dependabot::FileFetchers::Base
       extend T::Sig
 
+      XCODE_SPM_PACKAGE_RESOLVED_PATH = "project.xcworkspace/xcshareddata/swiftpm/Package.resolved"
+
       sig { override.params(filenames: T::Array[String]).returns(T::Boolean) }
       def self.required_files_in?(filenames)
-        filenames.include?("Package.swift")
+        return true if filenames.include?("Package.swift")
+
+        if Dependabot::Experiments.enabled?(:enable_swift_xcode_spm)
+          return filenames.any? { |f| f.end_with?("Package.resolved") }
+        end
+
+        false
       end
 
       sig { override.returns(String) }
       def self.required_files_message
-        "Repo must contain a Package.swift configuration file."
+        if Dependabot::Experiments.enabled?(:enable_swift_xcode_spm)
+          "Repo must contain a Package.swift configuration file or " \
+            "an .xcodeproj directory with a Package.resolved file."
+        else
+          "Repo must contain a Package.swift configuration file."
+        end
       end
 
       sig { override.returns(T::Array[DependencyFile]) }
       def fetch_files
-        fetched_files = []
-        fetched_files << package_manifest
-        fetched_files << package_resolved if package_resolved
+        fetched_files = T.let([], T::Array[DependencyFile])
+
+        manifest = package_manifest
+        if manifest
+          fetched_files << manifest
+          resolved = package_resolved
+          fetched_files << resolved if resolved
+          return fetched_files
+        end
+
+        # Base class validates returned files against required_files_in? and raises if needed
+        return fetched_files unless Dependabot::Experiments.enabled?(:enable_swift_xcode_spm)
+
+        fetch_xcode_spm_files(fetched_files)
         fetched_files
       end
 
       private
 
-      sig { returns(Dependabot::DependencyFile) }
+      sig { returns(T.nilable(Dependabot::DependencyFile)) }
       def package_manifest
-        @package_manifest ||= T.let(fetch_file_from_host("Package.swift"), T.nilable(DependencyFile))
+        @package_manifest ||= T.let(fetch_file_if_present("Package.swift"), T.nilable(DependencyFile))
       end
 
       sig { returns(T.nilable(DependencyFile)) }
       def package_resolved
-        @package_resolved = T.let(fetch_file_if_present("Package.resolved"), T.nilable(DependencyFile))
+        @package_resolved ||= T.let(fetch_file_if_present("Package.resolved"), T.nilable(DependencyFile))
+      end
+
+      sig { params(fetched_files: T::Array[DependencyFile]).void }
+      def fetch_xcode_spm_files(fetched_files)
+        xcodeproj_dirs.each do |xcodeproj_path|
+          pbxproj = fetch_support_file(File.join(xcodeproj_path, "project.pbxproj"))
+          fetched_files << pbxproj if pbxproj
+
+          resolved = fetch_file_if_present(File.join(xcodeproj_path, XCODE_SPM_PACKAGE_RESOLVED_PATH))
+          fetched_files << resolved if resolved
+        end
+      end
+
+      sig { returns(T::Array[String]) }
+      def xcodeproj_dirs
+        @xcodeproj_dirs ||= T.let(
+          repo_contents(dir: ".", raise_errors: false)
+            .select { |entry| entry.type == "dir" && entry.name.end_with?(".xcodeproj") }
+            .map(&:name),
+          T.nilable(T::Array[String])
+        )
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-swift
 version: !ruby/object:Gem::Version
-  version: 0.362.0
+  version: 0.364.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.362.0
+        version: 0.364.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.362.0
+        version: 0.364.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -85,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec-sorbet
   requirement: !ruby/object:Gem::Requirement
@@ -266,7 +266,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.362.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.364.0
 rdoc_options: []
 require_paths:
 - lib