dependabot-swift 0.390.0 → 0.391.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/dependabot/swift/file_parser/package_resolved_parser.rb +1 -1
- data/lib/dependabot/swift/file_parser/pbxproj_parser.rb +9 -12
- data/lib/dependabot/swift/file_updater/pbxproj_updater.rb +5 -8
- data/lib/dependabot/swift/file_updater/xcode_lockfile_updater.rb +1 -1
- data/lib/dependabot/swift/native_requirement.rb +1 -4
- data/lib/dependabot/swift/requirement.rb +1 -1
- data/lib/dependabot/swift/update_checker/requirements_updater.rb +1 -1
- data/lib/dependabot/swift/version.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ecf967273053e6c62d8f9ec69dbf8107ff0e7720da9b82ee9bb30fbf467f4d05
|
|
4
|
+
data.tar.gz: 7f701d0432112af31d360659a51be50726bdb1d40a5eda41716417a8ce075597
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6559a6a5b51751081c2a2052872f59f1eaf47b264b3585218d5fedc825626de7360a841944c9227cda87b0e22d21ed6e6041e52a128ca661cb91dbb0c48a2cb2
|
|
7
|
+
data.tar.gz: 1da30c2a26fde87da25fbbcc1ff5e5d378680f325bc3cad1d29fb383ba984f7dc9d7e76e3fee86ca9c96b8bf958c2e0fc2ef963e0410af60f66c4c17628b2dcc
|
|
@@ -15,7 +15,7 @@ module Dependabot
|
|
|
15
15
|
class PackageResolvedParser
|
|
16
16
|
extend T::Sig
|
|
17
17
|
|
|
18
|
-
SUPPORTED_VERSIONS =
|
|
18
|
+
SUPPORTED_VERSIONS = [1, 2, 3].freeze
|
|
19
19
|
|
|
20
20
|
# Maps schema version to the JSON keys used for each pin field
|
|
21
21
|
PIN_KEYS = T.let(
|
|
@@ -23,23 +23,20 @@ module Dependabot
|
|
|
23
23
|
# Regex to extract XCRemoteSwiftPackageReference blocks from pbxproj.
|
|
24
24
|
# Uses [^}]* to match the requirement block content — this is safe because
|
|
25
25
|
# Xcode requirement blocks are always flat dictionaries with no nested braces.
|
|
26
|
-
PACKAGE_REF_BLOCK =
|
|
27
|
-
/
|
|
26
|
+
PACKAGE_REF_BLOCK = /
|
|
28
27
|
isa\s*=\s*XCRemoteSwiftPackageReference;\s*
|
|
29
28
|
repositoryURL\s*=\s*"(?<url>[^"]+)";\s*
|
|
30
29
|
requirement\s*=\s*\{(?<requirement>[^}]*)\};
|
|
31
|
-
/mx
|
|
32
|
-
Regexp
|
|
33
|
-
)
|
|
30
|
+
/mx
|
|
34
31
|
|
|
35
32
|
# Patterns for extracting requirement fields
|
|
36
|
-
KIND_PATTERN =
|
|
37
|
-
VERSION_NUMBER_PATTERN =
|
|
38
|
-
MIN_VERSION_PATTERN =
|
|
39
|
-
MAX_VERSION_PATTERN =
|
|
40
|
-
VERSION_PATTERN =
|
|
41
|
-
BRANCH_PATTERN =
|
|
42
|
-
REVISION_PATTERN =
|
|
33
|
+
KIND_PATTERN = /kind\s*=\s*(\w+);/
|
|
34
|
+
VERSION_NUMBER_PATTERN = /[0-9A-Za-z.+-]+/
|
|
35
|
+
MIN_VERSION_PATTERN = /minimumVersion\s*=\s*(#{VERSION_NUMBER_PATTERN});/
|
|
36
|
+
MAX_VERSION_PATTERN = /maximumVersion\s*=\s*(#{VERSION_NUMBER_PATTERN});/
|
|
37
|
+
VERSION_PATTERN = /version\s*=\s*(#{VERSION_NUMBER_PATTERN});/
|
|
38
|
+
BRANCH_PATTERN = /branch\s*=\s*"?([^";]+)"?;/
|
|
39
|
+
REVISION_PATTERN = /revision\s*=\s*"?([^";]+)"?;/
|
|
43
40
|
|
|
44
41
|
sig { params(pbxproj_file: Dependabot::DependencyFile).void }
|
|
45
42
|
def initialize(pbxproj_file)
|
|
@@ -19,8 +19,7 @@ module Dependabot
|
|
|
19
19
|
class PbxprojUpdater
|
|
20
20
|
extend T::Sig
|
|
21
21
|
|
|
22
|
-
PACKAGE_REF_BLOCK =
|
|
23
|
-
/
|
|
22
|
+
PACKAGE_REF_BLOCK = /
|
|
24
23
|
(isa\s*=\s*XCRemoteSwiftPackageReference;\s*
|
|
25
24
|
repositoryURL\s*=\s*")
|
|
26
25
|
([^"]+)
|
|
@@ -28,13 +27,11 @@ module Dependabot
|
|
|
28
27
|
requirement\s*=\s*\{)
|
|
29
28
|
([^}]*)
|
|
30
29
|
(\};)
|
|
31
|
-
/mx
|
|
32
|
-
Regexp
|
|
33
|
-
)
|
|
30
|
+
/mx
|
|
34
31
|
|
|
35
|
-
KIND_PATTERN =
|
|
36
|
-
MIN_VERSION_PATTERN =
|
|
37
|
-
VERSION_PATTERN =
|
|
32
|
+
KIND_PATTERN = /kind\s*=\s*(\w+);/
|
|
33
|
+
MIN_VERSION_PATTERN = /minimumVersion\s*=\s*[0-9A-Za-z.+-]+;/
|
|
34
|
+
VERSION_PATTERN = /\bversion\s*=\s*[0-9A-Za-z.+-]+;/
|
|
38
35
|
|
|
39
36
|
sig do
|
|
40
37
|
params(
|
|
@@ -17,7 +17,7 @@ module Dependabot
|
|
|
17
17
|
class XcodeLockfileUpdater
|
|
18
18
|
extend T::Sig
|
|
19
19
|
|
|
20
|
-
SUPPORTED_VERSIONS =
|
|
20
|
+
SUPPORTED_VERSIONS = [1, 2, 3].freeze
|
|
21
21
|
|
|
22
22
|
# Maps schema version to the JSON keys used for each pin field
|
|
23
23
|
PIN_KEYS = T.let(
|
|
@@ -11,10 +11,7 @@ module Dependabot
|
|
|
11
11
|
extend T::Sig
|
|
12
12
|
|
|
13
13
|
# TODO: Support pinning to specific revisions
|
|
14
|
-
REGEXP =
|
|
15
|
-
/(from.*|\.upToNextMajor.*|\.upToNextMinor.*|"[^"]*"\s*\.\.[\.<]\s*"[^"]*".*|exact.*|\.exact.*)/,
|
|
16
|
-
Regexp
|
|
17
|
-
)
|
|
14
|
+
REGEXP = /(from.*|\.upToNextMajor.*|\.upToNextMinor.*|"[^"]*"\s*\.\.[\.<]\s*"[^"]*".*|exact.*|\.exact.*)/
|
|
18
15
|
|
|
19
16
|
sig { returns(String) }
|
|
20
17
|
attr_reader :declaration
|
|
@@ -22,7 +22,7 @@ module Dependabot
|
|
|
22
22
|
"(?:-#{pre_id}(?:\\.#{pre_id})*)?" \
|
|
23
23
|
'(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?'
|
|
24
24
|
|
|
25
|
-
PATTERN =
|
|
25
|
+
PATTERN = /\A\s*(#{quoted})?\s*(#{version_pattern})\s*\z/
|
|
26
26
|
|
|
27
27
|
# Parse each boundary into a Swift::Version so prerelease boundaries use SemVer section 11 ordering.
|
|
28
28
|
sig { override.params(obj: T.any(Gem::Version, String)).returns([String, Gem::Version]) }
|
|
@@ -26,7 +26,7 @@ module Dependabot
|
|
|
26
26
|
T::Array[Dependabot::DependencyRequirement]
|
|
27
27
|
)
|
|
28
28
|
@xcode_mode = xcode_mode
|
|
29
|
-
@target_commit_sha =
|
|
29
|
+
@target_commit_sha = target_commit_sha
|
|
30
30
|
|
|
31
31
|
return unless target_version && Version.correct?(target_version)
|
|
32
32
|
|
|
@@ -14,7 +14,7 @@ module Dependabot
|
|
|
14
14
|
extend T::Sig
|
|
15
15
|
|
|
16
16
|
# SEMVER_REGEX uses ^/$ line anchors; anchor to the whole string to reject multiline.
|
|
17
|
-
SEMVER_ANCHORED =
|
|
17
|
+
SEMVER_ANCHORED = /\A#{SEMVER_REGEX.source}\z/x
|
|
18
18
|
|
|
19
19
|
sig { override.params(version: VersionParameter).returns(T::Boolean) }
|
|
20
20
|
def self.correct?(version)
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dependabot-swift
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.391.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Dependabot
|
|
@@ -15,14 +15,14 @@ dependencies:
|
|
|
15
15
|
requirements:
|
|
16
16
|
- - '='
|
|
17
17
|
- !ruby/object:Gem::Version
|
|
18
|
-
version: 0.
|
|
18
|
+
version: 0.391.0
|
|
19
19
|
type: :runtime
|
|
20
20
|
prerelease: false
|
|
21
21
|
version_requirements: !ruby/object:Gem::Requirement
|
|
22
22
|
requirements:
|
|
23
23
|
- - '='
|
|
24
24
|
- !ruby/object:Gem::Version
|
|
25
|
-
version: 0.
|
|
25
|
+
version: 0.391.0
|
|
26
26
|
- !ruby/object:Gem::Dependency
|
|
27
27
|
name: debug
|
|
28
28
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -272,7 +272,7 @@ licenses:
|
|
|
272
272
|
- MIT
|
|
273
273
|
metadata:
|
|
274
274
|
bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
|
|
275
|
-
changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.
|
|
275
|
+
changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.391.0
|
|
276
276
|
rdoc_options: []
|
|
277
277
|
require_paths:
|
|
278
278
|
- lib
|