dependabot-gradle 0.400.0 → 0.401.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.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/dependabot/gradle/file_parser.rb +15 -4
  3. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6ac1e839adfadf5980755d1f36ee58e4e26a71c16369ad5e9e4cc67be22c3bd8
4
- data.tar.gz: bd6a1439e622474c62d724cac0161f953c41451b8509b0b84abde59aeb8c3cf6
3
+ metadata.gz: 1a2962474caa0703d22741525dbca66a6d24a43ad004cdb2fdc205c2ae214082
4
+ data.tar.gz: 1a0620950d708fb832b8e66f816be1b45eb8cb9c88e726fca3ebfb2fa7ba6b62
5
5
  SHA512:
6
- metadata.gz: 1409526fb930d1d9aca7f2beeea6c3f4d60b2029b14341ba0c6e3c65479246ad4579467f6f877ec76b14069558954a1364b5475ff9b72e384ea4e77752ed1298
7
- data.tar.gz: 4a188fc94783c49e1900f67d4390309876d6080ad41b5ab5ef4f527b7f730291d285c6d34e23ec23880f7a23b0c7b4709326a572eddda702bd33847e9ab74b47
6
+ metadata.gz: 9675dbcfd52f0eabedad7cbf65c947641fffd2ddd50854f86efec1bc365637f2fc6cf78aa59f4c277a1f58c541beb21ff350860483b2989211ccdcba6eeac3a5
7
+ data.tar.gz: 1c937e242e9b1f677fbd093c340cf98bee580407d3254a81f383e0abdd2a771376f8e869181a96492c80397ad5922338602dfa3724a0a0300847d157eea47214
data/lib/dependabot/gradle/file_parser.rb CHANGED
@@ -41,7 +41,8 @@ module Dependabot
41
41
  DEPENDENCY_DECLARATION_REGEX = /(?:\(|\s)\s*['"](?<declaration>#{PART}:#{PART}:#{VSN_PART})['"]/o
42
42
 
43
43
  DEPENDENCY_SET_DECLARATION_REGEX = /(?:^|\s)dependencySet\((?<arguments>[^\)]+)\)\s*\{/
44
- DEPENDENCY_SET_ENTRY_REGEX = /entry\s+['"](?<name>#{PART})['"]/o
44
+ DEPENDENCY_SET_COORDINATES_REGEX = /\A\s*['"](?<group>#{PART}):(?<version>#{VSN_PART})['"]\s*\z/o
45
+ DEPENDENCY_SET_ENTRY_REGEX = /\bentry(?:\s+|\s*\(\s*)['"](?<name>#{PART})['"]/o
45
46
  PLUGIN_BLOCK_DECLARATION_REGEX = /(?:^|\s)plugins\s*\{/
46
47
  PLUGIN_ID_REGEX = /['"](?<id>#{PART})['"]/o
47
48
  DEPENDENCY_SUBSTITUTION_DECLARATION_REGEX = /\bdependencySubstitution\s*\{/
@@ -466,9 +467,7 @@ module Dependabot
466
467
  end
467
468
 
468
469
  dependency_set_blocks.each do |blk|
469
- arguments = T.must(blk[:arguments])
470
- group = argument_from_string(arguments, "group")
471
- version = argument_from_string(arguments, "version")
470
+ group, version = dependency_set_group_and_version(T.must(blk[:arguments]))
472
471
 
473
472
  next unless group && version
474
473
 
@@ -485,6 +484,18 @@ module Dependabot
485
484
  dependency_set
486
485
  end
487
486
 
487
+ # Groovy builds usually declare `dependencySet(group: 'g', version: 'v')`, while the Kotlin DSL only
488
+ # supports the `dependencySet("g:v")` coordinates form (which Groovy accepts as well).
489
+ sig { params(arguments: String).returns([T.nilable(String), T.nilable(String)]) }
490
+ def dependency_set_group_and_version(arguments)
491
+ group = argument_from_string(arguments, "group")
492
+ version = argument_from_string(arguments, "version")
493
+ return [group, version] if group && version
494
+
495
+ coordinates = arguments.match(DEPENDENCY_SET_COORDINATES_REGEX)
496
+ [coordinates&.[](:group), coordinates&.[](:version)]
497
+ end
498
+
488
499
  sig { params(buildfile: Dependabot::DependencyFile).returns(DependencySet) }
489
500
  def plugin_dependencies(buildfile)
490
501
  dependency_set = DependencySet.new
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.400.0
4
+ version: 0.401.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.400.0
18
+ version: 0.401.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.400.0
25
+ version: 0.401.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.400.0
32
+ version: 0.401.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.400.0
39
+ version: 0.401.0
40
40
  - !ruby/object:Gem::Dependency
41
41
  name: debug
42
42
  requirement: !ruby/object:Gem::Requirement
@@ -291,7 +291,7 @@ licenses:
291
291
  - MIT
292
292
  metadata:
293
293
  bug_tracker_uri: https://github.com/dependabot/dependabot-core/issues
294
- changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.400.0
294
+ changelog_uri: https://github.com/dependabot/dependabot-core/releases/tag/v0.401.0
295
295
  rdoc_options: []
296
296
  require_paths:
297
297
  - lib