dependabot-swift 0.369.0 → 0.371.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffba3e2d47abede16d8578f4604ab638a59d08873d56dadb884f2b7a4750714b
-  data.tar.gz: d3df9f2a33ebb10871918caa8946d284457760403bc77b772d0d6be6a435820b
+  metadata.gz: dd49023c8b65d6ac267b5cd247fd86f4b14200babee47ef62ef7f25a98496812
+  data.tar.gz: f4144efe3e9a917632859d096abed5478306c462770d5f7418bd98706d22322f
 SHA512:
-  metadata.gz: b2f8b488b086c3d49adff713335088ea164884842d7ab07e592a29231b9a462b41cc46d0c8d314afbc5b4394b0ca8b595fcfda0cc80ee50ad6384e3933ba137d
-  data.tar.gz: 94eafc46297bc99402cea427f9d8c9cf8013101912e2edb712dbc406335954a6cec2fd1b0a532857da6820a0edfe9925fcc70ac211f52d3090fbf1b2f9953051
+  metadata.gz: 135daea8ece27cb1cb26cf0802b65774fbfd8bfb8c7718d1f5e3afb3b0ed69f607c1769825418c78b96f592e84344d4ebe81aba3ec081d56eb3bcb096f8ec926
+  data.tar.gz: fda6a71d93cb0fba5fd601231e749a72b6dc3123e5583f88d24e11b78841b3dacb490133051c42e6cf5236ea804140c32101871e2824eeab620b32ad0bc4ea9f

data/lib/dependabot/swift/file_fetcher.rb

@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 
 require "sorbet-runtime"
-require "dependabot/experiments"
 require "dependabot/file_fetchers"
 require "dependabot/file_fetchers/base"
 require "dependabot/swift/xcode_file_helpers"
@@ -21,21 +20,13 @@ module Dependabot
       def self.required_files_in?(filenames)
         return true if filenames.include?("Package.swift")
 
-        if Dependabot::Experiments.enabled?(:enable_swift_xcode_spm)
-          return filenames.any? { |f| XcodeFileHelpers.xcode_resolved_path?(f) }
-        end
-
-        false
+        filenames.any? { |f| XcodeFileHelpers.xcode_resolved_path?(f) }
       end
 
       sig { override.returns(String) }
       def self.required_files_message
-        if Dependabot::Experiments.enabled?(:enable_swift_xcode_spm)
-          "Repo must contain a Package.swift configuration file or " \
-            "an .xcodeproj/.xcworkspace directory with a Package.resolved file."
-        else
-          "Repo must contain a Package.swift configuration file."
-        end
+        "Repo must contain a Package.swift configuration file or " \
+          "an .xcodeproj/.xcworkspace directory with a Package.resolved file."
       end
 
       sig { override.returns(T::Array[DependencyFile]) }
@@ -51,8 +42,6 @@ module Dependabot
         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

data/lib/dependabot/swift/file_parser.rb

@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 
 require "dependabot/dependency"
-require "dependabot/experiments"
 require "dependabot/file_parsers"
 require "dependabot/file_parsers/base"
 require "dependabot/swift/file_parser/dependency_parser"
@@ -84,8 +83,7 @@ module Dependabot
 
       sig { returns(T::Boolean) }
       def xcode_spm_mode?
-        Dependabot::Experiments.enabled?(:enable_swift_xcode_spm) &&
-          xcode_resolved_files.any?
+        xcode_resolved_files.any?
       end
 
       sig { returns(Dependabot::Swift::FileParser::DependencyParser) }
@@ -100,14 +98,9 @@ module Dependabot
       sig { override.void }
       def check_required_files
         return if package_manifest_file
+        return if xcode_resolved_files.any?
 
-        if Dependabot::Experiments.enabled?(:enable_swift_xcode_spm)
-          return if xcode_resolved_files.any?
-
-          raise "No Package.swift or Xcode Package.resolved found!"
-        end
-
-        raise "No Package.swift!"
+        raise "No Package.swift or Xcode Package.resolved found!"
       end
 
       sig { returns(T.nilable(Dependabot::DependencyFile)) }

data/lib/dependabot/swift/file_updater.rb

@@ -1,7 +1,6 @@
 # typed: strict
 # frozen_string_literal: true
 
-require "dependabot/experiments"
 require "dependabot/file_updaters"
 require "dependabot/file_updaters/base"
 require "dependabot/swift/xcode_file_helpers"
@@ -97,8 +96,6 @@ module Dependabot
 
       sig { returns(T::Boolean) }
       def xcode_spm_mode?
-        return false unless Dependabot::Experiments.enabled?(:enable_swift_xcode_spm)
-
         manifest.nil? && xcode_resolved_files.any?
       end
 

data/lib/dependabot/swift/native_requirement.rb

@@ -11,7 +11,10 @@ module Dependabot
       extend T::Sig
 
       # TODO: Support pinning to specific revisions
-      REGEXP = T.let(/(from.*|\.upToNextMajor.*|\.upToNextMinor.*|".*"\s*\.\.[\.<]\s*".*"|exact.*|\.exact.*)/, Regexp)
+      REGEXP = T.let(
+        /(from.*|\.upToNextMajor.*|\.upToNextMinor.*|".*"\s*\.\.[\.<]\s*".*"\s*,?|exact.*|\.exact.*)/,
+        Regexp
+      )
 
       sig { returns(String) }
       attr_reader :declaration
@@ -85,23 +88,23 @@ module Dependabot
       sig { params(declaration: String).returns([String, String]) }
       def parse_declaration(declaration)
         if up_to_next_major?
-          min = declaration.gsub(/\Afrom\s*:\s*"(\S+)"\s*\z/, '\1')
+          min = declaration.gsub(/\Afrom\s*:\s*"(\S+?)"\s*(?:,\s*)?\z/, '\1')
           max = bump_major(min)
         elsif up_to_next_major_deprecated?
-          min = declaration.gsub(/\A\.upToNextMajor\s*\(\s*from\s*:\s*"(\S+)"\s*\)\z/, '\1')
+          min = declaration.gsub(/\A\.upToNextMajor\s*\(\s*from\s*:\s*"(\S+?)"\s*(?:,\s*)?\)\s*(?:,\s*)?\z/, '\1')
           max = bump_major(min)
         elsif up_to_next_minor_deprecated?
-          min = declaration.gsub(/\A\.upToNextMinor\s*\(\s*from\s*:\s*"(\S+)"\s*\)\z/, '\1')
+          min = declaration.gsub(/\A\.upToNextMinor\s*\(\s*from\s*:\s*"(\S+?)"\s*(?:,\s*)?\)\s*(?:,\s*)?\z/, '\1')
           max = bump_minor(min)
         elsif closed_range?
           min, max = parse_range("...")
         elsif range?
           min, max = parse_range("..<")
         elsif exact_version?
-          min = declaration.gsub(/\Aexact\s*:\s*"(\S+)"\s*\z/, '\1')
+          min = declaration.gsub(/\Aexact\s*:\s*"(\S+?)"\s*(?:,\s*)?\z/, '\1')
           max = min
         elsif exact_version_deprecated?
-          min = declaration.gsub(/\A\.exact\s*\(\s*"(\S+)"\s*\)\z/, '\1')
+          min = declaration.gsub(/\A\.exact\s*\(\s*"(\S+?)"\s*(?:,\s*)?\)\s*(?:,\s*)?\z/, '\1')
           max = min
         else
           raise "Unsupported constraint: #{declaration}"
@@ -112,7 +115,7 @@ module Dependabot
 
       sig { params(separator: String).returns(T::Array[String]) }
       def parse_range(separator)
-        declaration.split(separator).map { |str| unquote(str.strip) }
+        declaration.delete_suffix(",").split(separator).map { |str| unquote(str.strip) }
       end
 
       sig { returns(T::Boolean) }

data/lib/dependabot/swift/update_checker.rb

@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 
 require "sorbet-runtime"
-require "dependabot/experiments"
 require "dependabot/update_checkers"
 require "dependabot/update_checkers/base"
 require "dependabot/update_checkers/version_filters"
@@ -100,8 +99,6 @@ module Dependabot
 
       sig { returns(T::Boolean) }
       def xcode_spm_mode?
-        return false unless Dependabot::Experiments.enabled?(:enable_swift_xcode_spm)
-
         manifest.nil? && xcode_resolved_files.any?
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-swift
 version: !ruby/object:Gem::Version
-  version: 0.369.0
+  version: 0.371.0
 platform: ruby
 authors:
 - Dependabot
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.369.0
+        version: 0.371.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.369.0
+        version: 0.371.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -274,7 +274,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.369.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.371.0
 rdoc_options: []
 require_paths:
 - lib