dependabot-swift 0.382.0 → 0.383.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a04facb548d794c013bb4f05d67b1b13dd965e87cc06f7ae17cec09963f90a3
-  data.tar.gz: fa0c11ca3bb1b86184f67a5c92432df42beaf443a27854dbfd03691d649d855d
+  metadata.gz: fd3b92ca6615165f561e6be3ec0d2699534b646c5e916e774a9a9e536a23c56c
+  data.tar.gz: 99a5a43bed40eab511e7b8948fd8972b9ba709829e3050d017fd16351823b3fe
 SHA512:
-  metadata.gz: 0e4c70b470be46925531d54b6ae8d8d768f3046db6610084f5d74fbbaf45e453fbdbdd95428298bf24d80290a7244ab650640083a5b59744a0f80e69a7c23283
-  data.tar.gz: 7182e4cccbe97b6a8a4b9c05bd583748eacbe813e96f417fdb7e1f8458a6ce83f8298a33bc4c7340e6e528688bdb213b6323d1c3cbdbe1db391071d20993c806
+  metadata.gz: bdc51dfd64d41dce709c7ce8e83ff2e100073af1b912b3fdb11fe1f3859a6a84c799896f2d42b644629ba51bd4859fb0213e1eff4c4cdeca6b94ddb84690684c
+  data.tar.gz: 602b5fd558036b1af40d093f7a250bca0d6daded595ee0a6dcd43eb1a8b40ad16e46f40e38ae9378a4533d374f26046aad93d279fa6c4666e4337773cb1db362

data/lib/dependabot/swift/native_requirement.rb

@@ -12,7 +12,7 @@ module Dependabot
 
       # TODO: Support pinning to specific revisions
       REGEXP = T.let(
-        /(from.*|\.upToNextMajor.*|\.upToNextMinor.*|".*"\s*\.\.[\.<]\s*".*"\s*,?|exact.*|\.exact.*)/,
+        /(from.*|\.upToNextMajor.*|\.upToNextMinor.*|"[^"]*"\s*\.\.[\.<]\s*"[^"]*".*|exact.*|\.exact.*)/,
         Regexp
       )
 
@@ -88,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*(?:,\s*)?\z/, '\1')
+          min = declaration.gsub(/\Afrom\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*(?:,\s*)?\)\s*(?:,\s*)?\z/, '\1')
+          min = declaration.gsub(/\A\.upToNextMajor\s*\(\s*from\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*(?:,\s*)?\)\s*(?:,\s*)?\z/, '\1')
+          min = declaration.gsub(/\A\.upToNextMinor\s*\(\s*from\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*(?:,\s*)?\z/, '\1')
+          min = declaration.gsub(/\Aexact\s*:\s*"(\S+?)"\s*(?:,.*)?\z/, '\1')
           max = min
         elsif exact_version_deprecated?
-          min = declaration.gsub(/\A\.exact\s*\(\s*"(\S+?)"\s*(?:,\s*)?\)\s*(?:,\s*)?\z/, '\1')
+          min = declaration.gsub(/\A\.exact\s*\(\s*"(\S+?)"\s*(?:,\s*)?\)\s*(?:,.*)?\z/, '\1')
           max = min
         else
           raise "Unsupported constraint: #{declaration}"
@@ -115,7 +115,10 @@ module Dependabot
 
       sig { params(separator: String).returns(T::Array[String]) }
       def parse_range(separator)
-        declaration.delete_suffix(",").split(separator).map { |str| unquote(str.strip) }
+        declaration
+          .gsub(/("[^"]*"\s*\.\.[\.<]\s*"[^"]*").*/, '\1')
+          .split(separator)
+          .map { |str| unquote(str.strip) }
       end
 
       sig { returns(T::Boolean) }

data/lib/dependabot/swift/requirement.rb

@@ -16,12 +16,12 @@ module Dependabot
       # always contains a single element.
       sig { override.params(requirement_string: T.nilable(String)).returns(T::Array[Requirement]) }
       def self.requirements_array(requirement_string)
-        [new(requirement_string)]
+        [new(T.must(requirement_string))]
       end
 
       # Patches Gem::Requirement to make it accept requirement strings like
       # "~> 4.2.5, >= 4.2.5.1" without first needing to split them.
-      sig { params(requirements: T.untyped).void }
+      sig { params(requirements: T.any(String, T::Array[String])).void }
       def initialize(*requirements)
         requirements = requirements.flatten.flat_map do |req_string|
           req_string.split(",").map(&:strip)

data/lib/dependabot/swift/update_checker/requirements_updater.rb

@@ -1,6 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
+require "dependabot/dependency_requirement"
 require "dependabot/update_checkers/base"
 require "dependabot/swift/native_requirement"
 require "dependabot/swift/version"
@@ -13,14 +14,17 @@ module Dependabot
 
         sig do
           params(
-            requirements: T::Array[T::Hash[Symbol, T.untyped]],
+            requirements: T::Array[Dependabot::DependencyRequirement],
             target_version: T.nilable(T.any(String, Gem::Version)),
             xcode_mode: T::Boolean,
             target_commit_sha: T.nilable(String)
           ).void
         end
         def initialize(requirements:, target_version:, xcode_mode: false, target_commit_sha: nil)
-          @requirements = requirements
+          @requirements = T.let(
+            requirements.map { |req| Dependabot::DependencyRequirement.create(req) },
+            T::Array[Dependabot::DependencyRequirement]
+          )
           @xcode_mode = xcode_mode
           @target_commit_sha = T.let(target_commit_sha, T.nilable(String))
 
@@ -29,18 +33,19 @@ module Dependabot
           @target_version = T.let(Version.new(target_version), Dependabot::Version)
         end
 
-        sig { returns(T::Array[T::Hash[Symbol, T.untyped]]) }
+        sig { returns(T::Array[Dependabot::DependencyRequirement]) }
         def updated_requirements
           return updated_xcode_requirements if xcode_mode
 
-          NativeRequirement.map_requirements(requirements) do |requirement|
+          updated = NativeRequirement.map_requirements(requirements) do |requirement|
             T.must(requirement.update_if_needed(T.must(target_version)))
           end
+          updated.map { |req| Dependabot::DependencyRequirement.create(req) }
         end
 
         private
 
-        sig { returns(T::Array[T.untyped]) }
+        sig { returns(T::Array[Dependabot::DependencyRequirement]) }
         attr_reader :requirements
 
         sig { returns(T.nilable(Gem::Version)) }
@@ -53,7 +58,7 @@ module Dependabot
         attr_reader :target_commit_sha
 
         # For Xcode projects, we update the version in the requirement while preserving the kind.
-        sig { returns(T::Array[T::Hash[Symbol, T.untyped]]) }
+        sig { returns(T::Array[Dependabot::DependencyRequirement]) }
         def updated_xcode_requirements
           requirements.map do |req|
             next req unless target_version
@@ -63,7 +68,7 @@ module Dependabot
           end
         end
 
-        sig { params(requirement: T::Hash[Symbol, T.untyped]).returns(T::Hash[Symbol, T.untyped]) }
+        sig { params(requirement: Dependabot::DependencyRequirement).returns(Dependabot::DependencyRequirement) }
         def update_xcode_requirement(requirement)
           metadata = requirement[:metadata] || {}
           requirement_string = metadata[:requirement_string]
@@ -75,12 +80,14 @@ module Dependabot
           # Update source ref to target version
           updated_source = update_source_ref(requirement[:source])
 
-          requirement.merge(
-            requirement: new_requirement,
-            source: updated_source,
-            metadata: metadata.merge(
-              requirement_string: new_requirement_string
-            ).compact
+          Dependabot::DependencyRequirement.create(
+            requirement.merge(
+              requirement: new_requirement,
+              source: updated_source,
+              metadata: metadata.merge(
+                requirement_string: new_requirement_string
+              ).compact
+            )
           )
         end
 

data/lib/dependabot/swift/update_checker.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "sorbet-runtime"
+require "dependabot/dependency_requirement"
 require "dependabot/update_checkers"
 require "dependabot/update_checkers/base"
 require "dependabot/update_checkers/version_filters"
@@ -52,23 +53,21 @@ module Dependabot
 
       sig { override.returns(T::Array[Dependabot::DependencyRequirement]) }
       def updated_requirements
-        return wrap_requirements(updated_xcode_requirements) if xcode_spm_mode?
+        return updated_xcode_requirements if xcode_spm_mode?
 
         # If no target version is available, return old requirements unchanged
         target = preferred_resolvable_version
-        return wrap_requirements(old_requirements) unless target
+        return old_requirements unless target
 
-        wrap_requirements(
-          RequirementsUpdater.new(
-            requirements: old_requirements,
-            target_version: target
-          ).updated_requirements
-        )
+        RequirementsUpdater.new(
+          requirements: old_requirements,
+          target_version: target
+        ).updated_requirements
       end
 
       private
 
-      sig { returns(T::Array[T::Hash[Symbol, T.untyped]]) }
+      sig { returns(T::Array[Dependabot::DependencyRequirement]) }
       def updated_xcode_requirements
         # If no target version is available (e.g., revision-only or branch-pinned
         # dependency), return old requirements unchanged
@@ -94,7 +93,7 @@ module Dependabot
         ).updated_requirements
       end
 
-      sig { returns(T::Array[T::Hash[Symbol, T.untyped]]) }
+      sig { returns(T::Array[Dependabot::DependencyRequirement]) }
       def old_requirements
         dependency.requirements
       end

metadata

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