Skip to content

Commit c0a1874

Browse files
authored
Merge pull request #312 from zendesk/fvilela/version_bump
v4.29.10
2 parents a108191 + b132a90 commit c0a1874

File tree

6 files changed

+32
-27
lines changed

6 files changed

+32
-27
lines changed

.github/workflows/actions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
ruby-version: [2.6.8, 2.5.9, 2.4.10]
14+
ruby-version: [2.6.8, 2.5.9]
1515
steps:
1616
- uses: zendesk/checkout@v2
1717
- uses: zendesk/setup-ruby@v1

.rubocop.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AllCops:
2-
TargetRubyVersion: 2.3
2+
TargetRubyVersion: 2.6
33
Include:
44
- 'Gemfile'
55
- 'Rakefile'
@@ -15,13 +15,10 @@ Documentation:
1515
MethodLength:
1616
Enabled: false
1717

18-
SpaceInsideBrackets:
19-
Enabled: false
20-
2118
Style/Alias:
2219
Enabled: false
2320

24-
Layout/IndentArray:
21+
Layout/FirstArrayElementIndentation:
2522
Enabled: false
2623

2724
HashSyntax:
@@ -33,7 +30,7 @@ Metrics/LineLength:
3330
Metrics/BlockLength:
3431
Exclude:
3532
- 'spec/**/*.rb'
36-
33+
3734
Metrics/ModuleLength:
3835
CountComments: false # count full line comments?
3936
Max: 200

.rubocop_todo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Style/GuardClause:
4444
- 'lib/zendesk_apps_support/validations/source.rb'
4545

4646
# Offense count: 1
47-
Style/OpMethod:
47+
Naming/BinaryOperatorParameterName:
4848
Exclude:
4949
- 'lib/zendesk_apps_support/app_file.rb'
5050

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.0
1+
2.6

Gemfile.lock

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
zendesk_apps_support (4.29.9)
4+
zendesk_apps_support (4.29.10)
55
erubis
66
i18n
77
image_size (~> 2.0.2)
@@ -36,19 +36,21 @@ GEM
3636
crass (~> 1.0.2)
3737
nokogiri (>= 1.5.9)
3838
marcel (1.0.1)
39-
mini_portile2 (2.4.0)
40-
nokogiri (1.10.10)
41-
mini_portile2 (~> 2.4.0)
39+
mini_portile2 (2.6.1)
40+
nokogiri (1.12.3)
41+
mini_portile2 (~> 2.6.1)
42+
racc (~> 1.4)
4243
parallel (1.12.1)
43-
parser (2.7.2.0)
44+
parser (3.0.2.0)
4445
ast (~> 2.4.1)
45-
powerpack (0.1.3)
46-
rainbow (2.2.2)
47-
rake
48-
rake (13.0.3)
46+
racc (1.5.2)
47+
rainbow (3.0.0)
48+
rake (13.0.6)
4949
rb-fsevent (0.11.0)
5050
rb-inotify (0.9.10)
5151
ffi (>= 0.5.0, < 2)
52+
regexp_parser (2.1.1)
53+
rexml (3.2.5)
5254
rspec (3.4.0)
5355
rspec-core (~> 3.4.0)
5456
rspec-expectations (~> 3.4.0)
@@ -62,13 +64,17 @@ GEM
6264
diff-lcs (>= 1.2.0, < 2.0)
6365
rspec-support (~> 3.4.0)
6466
rspec-support (3.4.1)
65-
rubocop (0.49.1)
67+
rubocop (1.20.0)
6668
parallel (~> 1.10)
67-
parser (>= 2.3.3.1, < 3.0)
68-
powerpack (~> 0.1)
69-
rainbow (>= 1.99.1, < 3.0)
69+
parser (>= 3.0.0.0)
70+
rainbow (>= 2.2.2, < 4.0)
71+
regexp_parser (>= 1.8, < 3.0)
72+
rexml
73+
rubocop-ast (>= 1.9.1, < 2.0)
7074
ruby-progressbar (~> 1.7)
71-
unicode-display_width (~> 1.0, >= 1.0.1)
75+
unicode-display_width (>= 1.4.0, < 3.0)
76+
rubocop-ast (1.11.0)
77+
parser (>= 3.0.1.1)
7278
ruby-progressbar (1.11.0)
7379
sass (3.7.4)
7480
sass-listen (~> 4.0.0)
@@ -77,7 +83,7 @@ GEM
7783
rb-inotify (~> 0.9, >= 0.9.7)
7884
sassc (2.4.0)
7985
ffi (~> 1.9)
80-
unicode-display_width (1.7.0)
86+
unicode-display_width (2.0.0)
8187

8288
PLATFORMS
8389
ruby
@@ -88,8 +94,9 @@ DEPENDENCIES
8894
byebug (~> 9.0.6)
8995
faker (~> 1.6.6)
9096
parallel (= 1.12.1)
97+
rake
9198
rspec (~> 3.4.0)
92-
rubocop (~> 0.49.0)
99+
rubocop
93100
zendesk_apps_support!
94101

95102
BUNDLED WITH

zendesk_apps_support.gemspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gem::Specification.new do |s|
44
s.name = 'zendesk_apps_support'
5-
s.version = '4.29.9'
5+
s.version = '4.29.10'
66
s.license = 'Apache License Version 2.0'
77
s.authors = ['James A. Rosen', 'Likun Liu', 'Sean Caffery', 'Daniel Ribeiro']
88
s.email = ['dev@zendesk.com']
@@ -27,10 +27,11 @@ Gem::Specification.new do |s|
2727
s.add_development_dependency 'rspec', '~> 3.4.0'
2828
s.add_development_dependency 'bump', '~> 0.5.1'
2929
s.add_development_dependency 'faker', '~> 1.6.6'
30-
s.add_development_dependency 'rubocop', '~> 0.49.0'
30+
s.add_development_dependency 'rubocop'
3131
s.add_development_dependency 'byebug', '~> 9.0.6'
3232
s.add_development_dependency 'bundler', '2.2.26'
3333
s.add_development_dependency 'parallel', '1.12.1'
34+
s.add_development_dependency 'rake'
3435

3536
s.files = Dir.glob('{lib,config}/**/*') + %w[README.md LICENSE]
3637
end

0 commit comments

Comments
 (0)