dependabot-swift 0.225.0 → 0.226.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ece4598e2b52cc65a287a39c06f315c6971c62162bb5f571f8b35b8a7dcd95ca
-  data.tar.gz: a2e0c834bb02b3e8ee6cc0fac896083700ea4423154827ddee9b3ab9af9fc8d6
+  metadata.gz: db5c53249cce90cbbcc7af6b7caa03dabf0ba5868191bad0bd3715e2f8e38ef3
+  data.tar.gz: 8c969168a15ae0d90e3f31a3b11d082fe1951ac08deeb9a15b5d61d84c43fcc3
 SHA512:
-  metadata.gz: 1b53549f3e23982d335b6d8ab2e0e7bfb540fd708b22f1f220625a3aed3524af77586d097f8cc700af0839b31ded7fec9876643ee32413a76f81282c216efa8c
-  data.tar.gz: 284f0ee7c59cfe1854b77b23ba1ace37cbe3629512a67d4fa519ef148fc1276fd0a9530802878ebdc0295335bb2983c7c6978786ab5cd45c3aaa94b3186345e0
+  metadata.gz: 37668cae90b80db45b2d64c5f1d81387af452ef4938aed47e700ff316185c963aeae248a983d41fe6ec1cea430e1fa1cb3263e53f8fcbf58dfe0256435aaa9ad
+  data.tar.gz: 81e0899a0dc2e8ae824ace28d3ffc2a1320dc68e3f495107dcade4c7be57b1eddcaf1ec36e432f4e8a3d6273d4db9a350b0e7870330b00ee8c01f24151201681

data/lib/dependabot/swift/file_parser/dependency_parser.rb

@@ -49,7 +49,7 @@ module Dependabot
 
         def all_dependencies(data, level: 0)
           identity = data["identity"]
-          url = data["url"]
+          url = SharedHelpers.scp_to_standard(data["url"])
           name = normalize(url)
           version = data["version"]
 

data/lib/dependabot/swift/file_parser/manifest_parser.rb

@@ -8,7 +8,9 @@ module Dependabot
     class FileParser < Dependabot::FileParsers::Base
       class ManifestParser
         DEPENDENCY =
-          /(?<declaration>\.package\(\s*(?:name: "[^"]+",\s*)?url: "(?<url>[^"]+)",\s*(?<requirement>.*)\s*\))/
+          /(?<declaration>\.package\(\s*
+            (?:name:\s+"[^"]+",\s*)?url:\s+"(?<url>[^"]+)",\s*(?<requirement>#{NativeRequirement::REGEXP})\s*
+           \))/x
 
         def initialize(manifest, source:)
           @manifest = manifest
@@ -16,11 +18,8 @@ module Dependabot
         end
 
         def requirements
-          found = manifest.content.scan(DEPENDENCY).find do |_declaration, url, requirement|
-            # TODO: Support pinning to specific revisions
-            next if requirement.start_with?("branch:", ".branch(", "revision:", ".revision(")
-
-            url == source[:url]
+          found = manifest.content.scan(DEPENDENCY).find do |_declaration, url, _requirement|
+            SharedHelpers.scp_to_standard(url) == source[:url]
           end
 
           return [] unless found

data/lib/dependabot/swift/native_requirement.rb

@@ -6,6 +6,9 @@ require "dependabot/swift/requirement"
 module Dependabot
   module Swift
     class NativeRequirement
+      # TODO: Support pinning to specific revisions
+      REGEXP = /(from.*|\.upToNextMajor.*|\.upToNextMinor.*|".*"\s*\.\.[\.<]\s*".*"|exact.*|\.exact.*)/
+
       attr_reader :declaration
 
       def self.map_requirements(requirements)
@@ -94,7 +97,7 @@ module Dependabot
       end
 
       def single_version_declaration?
-        up_to_next_major? || up_to_next_major_deprecated? || up_to_next_minor? ||
+        up_to_next_major? || up_to_next_major_deprecated? || up_to_next_minor_deprecated? ||
           exact_version? || exact_version_deprecated?
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-swift
 version: !ruby/object:Gem::Version
-  version: 0.225.0
+  version: 0.226.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.225.0
+        version: 0.226.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.225.0
+        version: 0.226.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.1
+        version: 1.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.1
+        version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: stackprof
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +207,7 @@ licenses:
 - Nonstandard
 metadata:
   bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
-  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.225.0
+  changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.226.0
 post_install_message: 
 rdoc_options: []
 require_paths: