dependabot-gradle 0.334.0 → 0.335.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/gradle/file_fetcher.rb +20 -12
- data/lib/dependabot/gradle/file_parser.rb +21 -11
- data/lib/dependabot/gradle/file_updater/dependency_set_updater.rb +6 -4
- data/lib/dependabot/gradle/file_updater/property_value_updater.rb +12 -8
- data/lib/dependabot/gradle/file_updater.rb +6 -2
- data/lib/dependabot/gradle/package/package_details_fetcher.rb +4 -2
- data/lib/dependabot/gradle/update_checker/multi_dependency_updater.rb +8 -3
- data/lib/dependabot/gradle/update_checker/requirements_updater.rb +6 -2
- data/lib/dependabot/gradle/update_checker/version_finder.rb +35 -17
- data/lib/dependabot/gradle/version.rb +20 -14
- metadata +14 -14
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3e5db2f80726e1896f83ad3a9099e569064076753a55803ca0c2e90a7f0ce0ea
|
4
|
+
data.tar.gz: c0adb86d9832452722f650f3386a5d98c11c8a2e8d95e2edc77cac9173419d9e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 817b0b2f6c34c2c49da76d1e395ecb4ee57647ba0e8ad0c7e50df9388a296d735104492f562de13975098da31930616ae6936d88a41bd7c651b12b5b5a5c7d13
|
7
|
+
data.tar.gz: 15853ff156b8f21b7d62870c5019a7f1a3fb50befe79210fbff1f72008f3022c3c64f1ed445a4c873eb90527151b96bcd3956704875c62292466f27117b46eae
|
@@ -120,9 +120,11 @@ module Dependabot
|
|
120
120
|
lockfile_path = File.join(root_dir, path, @lockfile_name)
|
121
121
|
|
122
122
|
# Skip excluded subproject lockfiles
|
123
|
-
next nil if Dependabot::FileFiltering.should_exclude_path?(
|
124
|
-
|
125
|
-
|
123
|
+
next nil if Dependabot::FileFiltering.should_exclude_path?(
|
124
|
+
lockfile_path,
|
125
|
+
"subproject lockfile in subproject '#{path}'",
|
126
|
+
@exclude_paths
|
127
|
+
)
|
126
128
|
|
127
129
|
fetch_file_from_host(lockfile_path)
|
128
130
|
rescue Dependabot::DependencyFileNotFound
|
@@ -145,18 +147,22 @@ module Dependabot
|
|
145
147
|
buildfile_path = File.join(root_dir, path, @buildfile_name)
|
146
148
|
|
147
149
|
# Skip excluded subproject buildfiles
|
148
|
-
next nil if Dependabot::FileFiltering.should_exclude_path?(
|
149
|
-
|
150
|
-
|
150
|
+
next nil if Dependabot::FileFiltering.should_exclude_path?(
|
151
|
+
buildfile_path,
|
152
|
+
"subproject buildfile in subproject '#{path}'",
|
153
|
+
@exclude_paths
|
154
|
+
)
|
151
155
|
|
152
156
|
fetch_file_from_host(buildfile_path)
|
153
157
|
else
|
154
158
|
subproject_dir = File.join(root_dir, path)
|
155
159
|
|
156
160
|
# Skip excluded subproject directories
|
157
|
-
next nil if Dependabot::FileFiltering.should_exclude_path?(
|
158
|
-
|
159
|
-
|
161
|
+
next nil if Dependabot::FileFiltering.should_exclude_path?(
|
162
|
+
subproject_dir,
|
163
|
+
"subproject directory for subproject '#{path}'",
|
164
|
+
@exclude_paths
|
165
|
+
)
|
160
166
|
|
161
167
|
buildfile(subproject_dir)
|
162
168
|
end
|
@@ -189,9 +195,11 @@ module Dependabot
|
|
189
195
|
|
190
196
|
dependency_plugin_paths.filter_map do |path|
|
191
197
|
# Skip excluded dependency script plugins
|
192
|
-
next nil if Dependabot::FileFiltering.should_exclude_path?(
|
193
|
-
|
194
|
-
|
198
|
+
next nil if Dependabot::FileFiltering.should_exclude_path?(
|
199
|
+
path,
|
200
|
+
"dependency script plugin",
|
201
|
+
@exclude_paths
|
202
|
+
)
|
195
203
|
|
196
204
|
fetch_file_from_host(path)
|
197
205
|
rescue Dependabot::DependencyFileNotFound
|
@@ -27,8 +27,10 @@ module Dependabot
|
|
27
27
|
require "dependabot/file_parsers/base/dependency_set"
|
28
28
|
require_relative "file_parser/property_value_finder"
|
29
29
|
|
30
|
-
SUPPORTED_BUILD_FILE_NAMES = T.let(
|
31
|
-
|
30
|
+
SUPPORTED_BUILD_FILE_NAMES = T.let(
|
31
|
+
%w(build.gradle build.gradle.kts settings.gradle settings.gradle.kts).freeze,
|
32
|
+
T::Array[String]
|
33
|
+
)
|
32
34
|
|
33
35
|
PROPERTY_REGEX = T.let(
|
34
36
|
/
|
@@ -109,9 +111,12 @@ module Dependabot
|
|
109
111
|
|
110
112
|
sig { returns(T.nilable(Ecosystem::VersionManager)) }
|
111
113
|
def language
|
112
|
-
@language ||= T.let(
|
113
|
-
|
114
|
-
|
114
|
+
@language ||= T.let(
|
115
|
+
begin
|
116
|
+
Language.new("NOT-AVAILABLE")
|
117
|
+
end,
|
118
|
+
T.nilable(Dependabot::Gradle::Language)
|
119
|
+
)
|
115
120
|
end
|
116
121
|
|
117
122
|
sig { params(toml_file: Dependabot::DependencyFile).returns(DependencySet) }
|
@@ -460,10 +465,13 @@ module Dependabot
|
|
460
465
|
metadata = T.let({}, T::Hash[Symbol, T.any(String, T::Hash[Symbol, String])])
|
461
466
|
metadata[:property_name] = version_property_name if version_property_name
|
462
467
|
if in_dependency_set
|
463
|
-
metadata[:dependency_set] = T.let(
|
464
|
-
|
465
|
-
|
466
|
-
|
468
|
+
metadata[:dependency_set] = T.let(
|
469
|
+
{
|
470
|
+
group: details_hash[:group],
|
471
|
+
version: details_hash[:version]
|
472
|
+
},
|
473
|
+
T::Hash[Symbol, String]
|
474
|
+
)
|
467
475
|
end
|
468
476
|
metadata
|
469
477
|
end
|
@@ -472,8 +480,10 @@ module Dependabot
|
|
472
480
|
def evaluated_value(value, buildfile)
|
473
481
|
return value unless value&.scan(PROPERTY_REGEX)&.one?
|
474
482
|
|
475
|
-
property_name
|
476
|
-
|
483
|
+
property_name = T.must(
|
484
|
+
T.must(value).match(PROPERTY_REGEX)
|
485
|
+
&.named_captures&.fetch("property_name")
|
486
|
+
)
|
477
487
|
property_value = property_value_finder.property_value(
|
478
488
|
property_name: property_name,
|
479
489
|
callsite_buildfile: buildfile
|
@@ -25,10 +25,12 @@ module Dependabot
|
|
25
25
|
updated_requirement: String
|
26
26
|
).returns(T::Array[Dependabot::DependencyFile])
|
27
27
|
end
|
28
|
-
def update_files_for_dep_set_change(
|
29
|
-
|
30
|
-
|
31
|
-
|
28
|
+
def update_files_for_dep_set_change(
|
29
|
+
dependency_set:,
|
30
|
+
buildfile:,
|
31
|
+
previous_requirement:,
|
32
|
+
updated_requirement:
|
33
|
+
)
|
32
34
|
declaration_string =
|
33
35
|
original_declaration_string(dependency_set, buildfile)
|
34
36
|
|
@@ -27,14 +27,18 @@ module Dependabot
|
|
27
27
|
)
|
28
28
|
.returns(T::Array[DependencyFile])
|
29
29
|
end
|
30
|
-
def update_files_for_property_change(
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
30
|
+
def update_files_for_property_change(
|
31
|
+
property_name:,
|
32
|
+
callsite_buildfile:,
|
33
|
+
previous_value:,
|
34
|
+
updated_value:
|
35
|
+
)
|
36
|
+
declaration_details = T.must(
|
37
|
+
property_value_finder.property_details(
|
38
|
+
property_name: property_name,
|
39
|
+
callsite_buildfile: callsite_buildfile
|
40
|
+
)
|
41
|
+
)
|
38
42
|
declaration_string = declaration_details.fetch(:declaration_string)
|
39
43
|
filename = declaration_details.fetch(:file)
|
40
44
|
|
@@ -184,8 +184,12 @@ module Dependabot
|
|
184
184
|
)
|
185
185
|
.returns(Dependabot::DependencyFile)
|
186
186
|
end
|
187
|
-
def update_version_in_buildfile(
|
188
|
-
|
187
|
+
def update_version_in_buildfile(
|
188
|
+
dependency,
|
189
|
+
buildfile,
|
190
|
+
previous_req,
|
191
|
+
requirement
|
192
|
+
)
|
189
193
|
original_content = T.must(buildfile.content.dup)
|
190
194
|
|
191
195
|
updated_content =
|
@@ -352,8 +352,10 @@ module Dependabot
|
|
352
352
|
|
353
353
|
sig { returns(Dependabot::Maven::Utils::AuthHeadersFinder) }
|
354
354
|
def auth_headers_finder
|
355
|
-
@auth_headers_finder ||= T.let(
|
356
|
-
|
355
|
+
@auth_headers_finder ||= T.let(
|
356
|
+
Dependabot::Maven::Utils::AuthHeadersFinder.new(credentials),
|
357
|
+
T.nilable(Dependabot::Maven::Utils::AuthHeadersFinder)
|
358
|
+
)
|
357
359
|
end
|
358
360
|
|
359
361
|
sig { params(maven_repo_url: String).returns(T::Hash[String, String]) }
|
@@ -25,9 +25,14 @@ module Dependabot
|
|
25
25
|
raise_on_ignored: T::Boolean
|
26
26
|
).void
|
27
27
|
end
|
28
|
-
def initialize(
|
29
|
-
|
30
|
-
|
28
|
+
def initialize(
|
29
|
+
dependency:,
|
30
|
+
dependency_files:,
|
31
|
+
credentials:,
|
32
|
+
target_version_details:,
|
33
|
+
ignored_versions:,
|
34
|
+
raise_on_ignored: false
|
35
|
+
)
|
31
36
|
@dependency = T.let(dependency, Dependabot::Dependency)
|
32
37
|
@dependency_files = T.let(dependency_files, T::Array[Dependabot::DependencyFile])
|
33
38
|
@credentials = T.let(credentials, T::Array[Dependabot::Credential])
|
@@ -34,8 +34,12 @@ module Dependabot
|
|
34
34
|
)
|
35
35
|
.void
|
36
36
|
end
|
37
|
-
def initialize(
|
38
|
-
|
37
|
+
def initialize(
|
38
|
+
requirements:,
|
39
|
+
latest_version:,
|
40
|
+
source_url:,
|
41
|
+
properties_to_update:
|
42
|
+
)
|
39
43
|
@requirements = requirements
|
40
44
|
@source_url = source_url
|
41
45
|
@properties_to_update = properties_to_update
|
@@ -23,14 +23,25 @@ module Dependabot
|
|
23
23
|
TYPE_SUFFICES = %w(jre android java native_mt agp).freeze
|
24
24
|
|
25
25
|
sig do
|
26
|
-
params(
|
27
|
-
|
28
|
-
|
29
|
-
|
26
|
+
params(
|
27
|
+
dependency: Dependabot::Dependency,
|
28
|
+
dependency_files: T::Array[Dependabot::DependencyFile],
|
29
|
+
credentials: T::Array[Dependabot::Credential],
|
30
|
+
ignored_versions: T::Array[String],
|
31
|
+
security_advisories: T::Array[Dependabot::SecurityAdvisory],
|
32
|
+
raise_on_ignored: T::Boolean,
|
33
|
+
cooldown_options: T.nilable(Dependabot::Package::ReleaseCooldownOptions)
|
34
|
+
).void
|
30
35
|
end
|
31
|
-
def initialize(
|
32
|
-
|
33
|
-
|
36
|
+
def initialize(
|
37
|
+
dependency:,
|
38
|
+
dependency_files:,
|
39
|
+
credentials:,
|
40
|
+
ignored_versions:,
|
41
|
+
security_advisories:,
|
42
|
+
raise_on_ignored: false,
|
43
|
+
cooldown_options: nil
|
44
|
+
)
|
34
45
|
@security_advisories = security_advisories
|
35
46
|
@dependency = dependency
|
36
47
|
@dependency_files = dependency_files
|
@@ -86,8 +97,10 @@ module Dependabot
|
|
86
97
|
possible_versions = filter_prerelease_versions(possible_versions)
|
87
98
|
possible_versions = filter_date_based_versions(possible_versions)
|
88
99
|
possible_versions = filter_version_types(possible_versions)
|
89
|
-
possible_versions = Dependabot::UpdateCheckers::VersionFilters.filter_vulnerable_versions(
|
90
|
-
|
100
|
+
possible_versions = Dependabot::UpdateCheckers::VersionFilters.filter_vulnerable_versions(
|
101
|
+
possible_versions,
|
102
|
+
security_advisories
|
103
|
+
)
|
91
104
|
possible_versions = filter_ignored_versions(possible_versions)
|
92
105
|
possible_versions = filter_lower_versions(possible_versions)
|
93
106
|
|
@@ -171,12 +184,15 @@ module Dependabot
|
|
171
184
|
|
172
185
|
sig { returns(Package::PackageDetailsFetcher) }
|
173
186
|
def package_details_fetcher
|
174
|
-
@package_details_fetcher ||= T.let(
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
187
|
+
@package_details_fetcher ||= T.let(
|
188
|
+
Package::PackageDetailsFetcher.new(
|
189
|
+
dependency: dependency,
|
190
|
+
dependency_files: dependency_files,
|
191
|
+
credentials: credentials,
|
192
|
+
forbidden_urls: []
|
193
|
+
),
|
194
|
+
T.nilable(Dependabot::Gradle::Package::PackageDetailsFetcher)
|
195
|
+
)
|
180
196
|
end
|
181
197
|
|
182
198
|
sig { params(possible_versions: T::Array[T.untyped]).returns(T::Array[T.untyped]) }
|
@@ -249,8 +265,10 @@ module Dependabot
|
|
249
265
|
passed_days = passed_seconds / DAY_IN_SECONDS
|
250
266
|
|
251
267
|
if passed_days < days
|
252
|
-
Dependabot.logger.info(
|
253
|
-
|
268
|
+
Dependabot.logger.info(
|
269
|
+
"Version #{release.version}, Release date: #{release.released_at}." \
|
270
|
+
" Days since release: #{passed_days} (cooldown days: #{days})"
|
271
|
+
)
|
254
272
|
end
|
255
273
|
|
256
274
|
# Check if the release is within the cooldown period
|
@@ -16,20 +16,26 @@ module Dependabot
|
|
16
16
|
extend T::Sig
|
17
17
|
|
18
18
|
NULL_VALUES = T.let(%w(0 final ga).freeze, T::Array[String])
|
19
|
-
PREFIXED_TOKEN_HIERARCHY = T.let(
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
19
|
+
PREFIXED_TOKEN_HIERARCHY = T.let(
|
20
|
+
{
|
21
|
+
"." => { qualifier: 1, number: 4 },
|
22
|
+
"-" => { qualifier: 2, number: 3 },
|
23
|
+
"_" => { qualifier: 2, number: 3 }
|
24
|
+
}.freeze,
|
25
|
+
T::Hash[String, T::Hash[Symbol, Integer]]
|
26
|
+
)
|
27
|
+
NAMED_QUALIFIERS_HIERARCHY = T.let(
|
28
|
+
{
|
29
|
+
"a" => 1, "alpha" => 1,
|
30
|
+
"b" => 2, "beta" => 2,
|
31
|
+
"m" => 3, "milestone" => 3,
|
32
|
+
"rc" => 4, "cr" => 4, "pr" => 4, "pre" => 4,
|
33
|
+
"snapshot" => 5, "dev" => 5,
|
34
|
+
"ga" => 6, "" => 6, "final" => 6,
|
35
|
+
"sp" => 7
|
36
|
+
}.freeze,
|
37
|
+
T::Hash[String, Integer]
|
38
|
+
)
|
33
39
|
VERSION_PATTERN = T.let(
|
34
40
|
"[0-9a-zA-Z]+" \
|
35
41
|
'(?>\.[0-9a-zA-Z]*)*' \
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dependabot-gradle
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.335.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Dependabot
|
@@ -15,28 +15,28 @@ dependencies:
|
|
15
15
|
requirements:
|
16
16
|
- - '='
|
17
17
|
- !ruby/object:Gem::Version
|
18
|
-
version: 0.
|
18
|
+
version: 0.335.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.335.0
|
26
26
|
- !ruby/object:Gem::Dependency
|
27
27
|
name: dependabot-maven
|
28
28
|
requirement: !ruby/object:Gem::Requirement
|
29
29
|
requirements:
|
30
30
|
- - '='
|
31
31
|
- !ruby/object:Gem::Version
|
32
|
-
version: 0.
|
32
|
+
version: 0.335.0
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
35
|
version_requirements: !ruby/object:Gem::Requirement
|
36
36
|
requirements:
|
37
37
|
- - '='
|
38
38
|
- !ruby/object:Gem::Version
|
39
|
-
version: 0.
|
39
|
+
version: 0.335.0
|
40
40
|
- !ruby/object:Gem::Dependency
|
41
41
|
name: debug
|
42
42
|
requirement: !ruby/object:Gem::Requirement
|
@@ -127,56 +127,56 @@ dependencies:
|
|
127
127
|
requirements:
|
128
128
|
- - "~>"
|
129
129
|
- !ruby/object:Gem::Version
|
130
|
-
version: '1.
|
130
|
+
version: '1.80'
|
131
131
|
type: :development
|
132
132
|
prerelease: false
|
133
133
|
version_requirements: !ruby/object:Gem::Requirement
|
134
134
|
requirements:
|
135
135
|
- - "~>"
|
136
136
|
- !ruby/object:Gem::Version
|
137
|
-
version: '1.
|
137
|
+
version: '1.80'
|
138
138
|
- !ruby/object:Gem::Dependency
|
139
139
|
name: rubocop-performance
|
140
140
|
requirement: !ruby/object:Gem::Requirement
|
141
141
|
requirements:
|
142
142
|
- - "~>"
|
143
143
|
- !ruby/object:Gem::Version
|
144
|
-
version: '1.
|
144
|
+
version: '1.26'
|
145
145
|
type: :development
|
146
146
|
prerelease: false
|
147
147
|
version_requirements: !ruby/object:Gem::Requirement
|
148
148
|
requirements:
|
149
149
|
- - "~>"
|
150
150
|
- !ruby/object:Gem::Version
|
151
|
-
version: '1.
|
151
|
+
version: '1.26'
|
152
152
|
- !ruby/object:Gem::Dependency
|
153
153
|
name: rubocop-rspec
|
154
154
|
requirement: !ruby/object:Gem::Requirement
|
155
155
|
requirements:
|
156
156
|
- - "~>"
|
157
157
|
- !ruby/object:Gem::Version
|
158
|
-
version: '
|
158
|
+
version: '3.7'
|
159
159
|
type: :development
|
160
160
|
prerelease: false
|
161
161
|
version_requirements: !ruby/object:Gem::Requirement
|
162
162
|
requirements:
|
163
163
|
- - "~>"
|
164
164
|
- !ruby/object:Gem::Version
|
165
|
-
version: '
|
165
|
+
version: '3.7'
|
166
166
|
- !ruby/object:Gem::Dependency
|
167
167
|
name: rubocop-sorbet
|
168
168
|
requirement: !ruby/object:Gem::Requirement
|
169
169
|
requirements:
|
170
170
|
- - "~>"
|
171
171
|
- !ruby/object:Gem::Version
|
172
|
-
version: '0.
|
172
|
+
version: '0.10'
|
173
173
|
type: :development
|
174
174
|
prerelease: false
|
175
175
|
version_requirements: !ruby/object:Gem::Requirement
|
176
176
|
requirements:
|
177
177
|
- - "~>"
|
178
178
|
- !ruby/object:Gem::Version
|
179
|
-
version: '0.
|
179
|
+
version: '0.10'
|
180
180
|
- !ruby/object:Gem::Dependency
|
181
181
|
name: simplecov
|
182
182
|
requirement: !ruby/object:Gem::Requirement
|
@@ -280,7 +280,7 @@ licenses:
|
|
280
280
|
- MIT
|
281
281
|
metadata:
|
282
282
|
bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
|
283
|
-
changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.
|
283
|
+
changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.335.0
|
284
284
|
rdoc_options: []
|
285
285
|
require_paths:
|
286
286
|
- lib
|