dependabot-gradle 0.143.0 → 0.143.1

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 (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/dependabot/gradle/requirement.rb +9 -11
  3. data/lib/dependabot/gradle/version.rb +1 -1
  4. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: db6059748f0c1f692f360fda9e80311ccafc6fd84ad878183c4c4316f48a4d7e
4
- data.tar.gz: 1b5ea811c9ef709285f5dbde439aa4b913cec9af04c1bf15297f5079b89a47ce
3
+ metadata.gz: 8c0d2e25163c6308d5e9d0a87fb293243cfde92477e559a0823b1a6f573e9487
4
+ data.tar.gz: a86c4c15ea8f0faf615517ea648e2fc5490dbfeb9e90d9cac4774bb9715bc377
5
5
  SHA512:
6
- metadata.gz: cf4462b6930947c632b12aeb6b8fd06a7906e2c4afc88ef6c5ae56cd2cd2ea82c6572723242f487f8febc26a7698561697a7f064ebbefdd1395fd185d23b771b
7
- data.tar.gz: ae774d6872823ad22a079104c94c8f8fe4d2fde67c446e040d82a11004d85138977ed62afa10090ea08a8670342307a717c09410a26797eb26b752e2ce3b8c73
6
+ metadata.gz: 782d5847ca17b05fef3a81e609b158809bfb7ada423c378cb8f3a218e30374949e5cb14bd44db99ce1c95c20319eed20ccc048bba5d968c369c68e4b57068b3b
7
+ data.tar.gz: e66afad1146dbe0c8b9108125fcbdb1b987d3fdddd56c8e629ae5b72a77db214984fb2aea9c83b20989fa6da141d75d76c9bafaa4479f8213df64569aa437897
data/lib/dependabot/gradle/requirement.rb CHANGED
@@ -33,14 +33,7 @@ module Dependabot
33
33
 
34
34
  def initialize(*requirements)
35
35
  requirements = requirements.flatten.flat_map do |req_string|
36
- # NOTE: Support ruby-style version requirements that are created from
37
- # PR ignore conditions
38
- version_reqs = req_string.split(",").map(&:strip)
39
- if version_reqs.all? { |s| Gem::Requirement::PATTERN.match?(s) }
40
- version_reqs
41
- else
42
- convert_java_constraint_to_ruby_constraint(req_string)
43
- end
36
+ convert_java_constraint_to_ruby_constraint(req_string)
44
37
  end
45
38
 
46
39
  super(requirements)
@@ -72,9 +65,14 @@ module Dependabot
72
65
  raise "Can't convert multiple Java reqs to a single Ruby one"
73
66
  end
74
67
 
75
- return convert_java_range_to_ruby_range(req_string) if req_string&.include?(",")
76
-
77
- convert_java_equals_req_to_ruby(req_string)
68
+ # NOTE: Support ruby-style version requirements that are created from
69
+ # PR ignore conditions
70
+ version_reqs = req_string.split(",").map(&:strip)
71
+ if req_string.include?(",") && !version_reqs.all? { |s| PATTERN.match?(s) }
72
+ convert_java_range_to_ruby_range(req_string) if req_string.include?(",")
73
+ else
74
+ version_reqs.map { |r| convert_java_equals_req_to_ruby(r) }
75
+ end
78
76
  end
79
77
 
80
78
  def convert_java_range_to_ruby_range(req_string)
data/lib/dependabot/gradle/version.rb CHANGED
@@ -28,7 +28,7 @@ module Dependabot
28
28
  VERSION_PATTERN =
29
29
  "[0-9a-zA-Z]+"\
30
30
  '(?>\.[0-9a-zA-Z]*)*'\
31
- '([_-][0-9A-Za-z_-]*(\.[0-9A-Za-z_-]*)*)?'
31
+ '([_\-\+][0-9A-Za-z_-]*(\.[0-9A-Za-z_-]*)*)?'
32
32
  ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/.freeze
33
33
 
34
34
  def self.correct?(version)
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.143.0
4
+ version: 0.143.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dependabot
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.143.0
19
+ version: 0.143.1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.143.0
26
+ version: 0.143.1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: dependabot-maven
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 0.143.0
33
+ version: 0.143.1
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 0.143.0
40
+ version: 0.143.1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: byebug
43
43
  requirement: !ruby/object:Gem::Requirement