Skip to content

Commit e9e435f

Browse files
authored
Merge pull request #54 from github/kh-bump-dependencies
chore: bump development dependencies
2 parents 8dcb259 + 92c4535 commit e9e435f

File tree

4 files changed

+94
-116
lines changed

4 files changed

+94
-116
lines changed

.github/workflows/ci.yml

Lines changed: 41 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -6,70 +6,56 @@ jobs:
66
lint:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@master
10-
- name: Setup Ruby
11-
uses: actions/setup-ruby@v1
12-
with:
13-
ruby-version: 3.0.x
14-
- uses: actions/cache@v2
15-
with:
16-
path: vendor/bundle
17-
key: gems-build-rails-main-ruby-2.7.x-${{ hashFiles('**/Gemfile.lock') }}
18-
- name: Lint with Rubocop
19-
run: |
20-
gem install bundler:2.2.32
21-
bundle config path vendor/bundle
22-
bundle install --jobs 4 --retry 3
23-
bundle exec rubocop
9+
- uses: actions/checkout@v3
10+
- name: Setup Ruby
11+
uses: ruby/setup-ruby@v1
12+
with:
13+
ruby-version: '3.0'
14+
bundler-cache: true
15+
- name: Lint with Rubocop
16+
run: |
17+
bundle install
18+
bundle exec rubocop
2419
test:
2520
strategy:
2621
fail-fast: false
2722
matrix:
28-
ruby_version: ["2.6", "2.7", "3.0"]
23+
ruby_version: ["2.7", "3.0"]
2924
runs-on: ubuntu-latest
3025
steps:
31-
- uses: actions/checkout@v2
32-
- name: Set up Ruby
33-
uses: ruby/setup-ruby@v1
34-
with:
35-
ruby-version: ${{ matrix.ruby_version }}
36-
- name: Install dependencies
37-
run: bundle install --jobs 4 --retry 3
38-
- name: Run tests
39-
run: bundle exec rake
26+
- uses: actions/checkout@v3
27+
- name: Setup Ruby
28+
uses: ruby/setup-ruby@v1
29+
with:
30+
ruby-version: ${{ matrix.ruby_version }}
31+
bundler-cache: true
32+
- name: Install dependencies
33+
run: bundle install
34+
- name: Run tests
35+
run: bundle exec rake
4036
docs-coverage:
4137
runs-on: ubuntu-latest
4238
steps:
43-
- uses: actions/checkout@master
44-
- name: Setup Ruby
45-
uses: actions/setup-ruby@v1
46-
with:
47-
ruby-version: 3.0.x
48-
- uses: actions/cache@v2
49-
with:
50-
path: vendor/bundle
51-
key: gems-build-rails-main-ruby-2.7.x-${{ hashFiles('**/Gemfile.lock') }}
52-
- name: Verify docs coverage
53-
run: |
54-
gem install bundler:2.2.32
55-
bundle config path vendor/bundle
56-
bundle install --jobs 4 --retry 3
57-
bundle exec rake docs:coverage
39+
- uses: actions/checkout@v3
40+
- name: Setup Ruby
41+
uses: ruby/setup-ruby@v1
42+
with:
43+
ruby-version: '3.0'
44+
bundler-cache: true
45+
- name: Verify docs coverage
46+
run: |
47+
bundle install
48+
bundle exec rake docs:coverage
5849
tests-coverage:
5950
runs-on: ubuntu-latest
6051
steps:
61-
- uses: actions/checkout@master
62-
- name: Setup Ruby
63-
uses: actions/setup-ruby@v1
64-
with:
65-
ruby-version: 3.0.x
66-
- uses: actions/cache@v2
67-
with:
68-
path: vendor/bundle
69-
key: gems-build-rails-main-ruby-2.7.x-${{ hashFiles('**/Gemfile.lock') }}
70-
- name: Verify all rules have test coverage
71-
run: |
72-
gem install bundler:2.2.32
73-
bundle config path vendor/bundle
74-
bundle install --jobs 4 --retry 3
75-
bundle exec rake tests:coverage
52+
- uses: actions/checkout@v3
53+
- name: Setup Ruby
54+
uses: ruby/setup-ruby@v1
55+
with:
56+
ruby-version: '3.0'
57+
bundler-cache: true
58+
- name: Verify all rules have test coverage
59+
run: |
60+
bundle install
61+
bundle exec rake tests:coverage

.rubocop.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
inherit_gem:
22
rubocop-github:
3-
- config/default_edge.yml
4-
- config/rails_edge.yml
3+
- config/default.yml
54

65
AllCops:
76
NewCops: enable
87
SuggestExtensions: false
98

10-
Rails/RefuteMethods:
11-
Enabled: false
12-
139
Style/Documentation:
1410
Enabled: false
15-
16-
Rails/RakeEnvironment:
17-
Enabled: false

Gemfile.lock

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,105 +6,104 @@ PATH
66
GEM
77
remote: https://rubygems.org/
88
specs:
9-
actionview (6.1.6)
10-
activesupport (= 6.1.6)
9+
actionview (7.0.4.2)
10+
activesupport (= 7.0.4.2)
1111
builder (~> 3.1)
1212
erubi (~> 1.4)
1313
rails-dom-testing (~> 2.0)
1414
rails-html-sanitizer (~> 1.1, >= 1.2.0)
15-
activesupport (6.1.6)
15+
activesupport (7.0.4.2)
1616
concurrent-ruby (~> 1.0, >= 1.0.2)
1717
i18n (>= 1.6, < 2)
1818
minitest (>= 5.1)
1919
tzinfo (~> 2.0)
20-
zeitwerk (~> 2.3)
2120
ast (2.4.2)
22-
better_html (1.0.16)
23-
actionview (>= 4.0)
24-
activesupport (>= 4.0)
21+
better_html (2.0.1)
22+
actionview (>= 6.0)
23+
activesupport (>= 6.0)
2524
ast (~> 2.0)
2625
erubi (~> 1.4)
27-
html_tokenizer (~> 0.0.6)
2826
parser (>= 2.4)
2927
smart_properties
3028
builder (3.2.4)
31-
concurrent-ruby (1.1.10)
29+
concurrent-ruby (1.2.0)
3230
crass (1.0.6)
33-
erb_lint (0.1.1)
31+
erb_lint (0.3.1)
3432
activesupport
35-
better_html (~> 1.0.7)
36-
html_tokenizer
33+
better_html (>= 2.0.1)
3734
parser (>= 2.7.1.4)
3835
rainbow
3936
rubocop
4037
smart_properties
41-
erubi (1.10.0)
42-
html_tokenizer (0.0.7)
43-
i18n (1.10.0)
38+
erubi (1.12.0)
39+
i18n (1.12.0)
4440
concurrent-ruby (~> 1.0)
45-
loofah (2.18.0)
41+
json (2.6.3)
42+
loofah (2.19.1)
4643
crass (~> 1.0.2)
4744
nokogiri (>= 1.5.9)
48-
mini_portile2 (2.8.0)
49-
minitest (5.15.0)
50-
mocha (1.14.0)
51-
nokogiri (1.13.6)
45+
mini_portile2 (2.8.1)
46+
minitest (5.17.0)
47+
mocha (2.0.2)
48+
ruby2_keywords (>= 0.0.5)
49+
nokogiri (1.14.0)
5250
mini_portile2 (~> 2.8.0)
5351
racc (~> 1.4)
5452
parallel (1.22.1)
55-
parser (3.1.2.0)
53+
parser (3.2.0.0)
5654
ast (~> 2.4.1)
57-
racc (1.6.0)
58-
rack (2.2.3.1)
55+
racc (1.6.2)
56+
rack (3.0.4.1)
5957
rails-dom-testing (2.0.3)
6058
activesupport (>= 4.2.0)
6159
nokogiri (>= 1.6)
62-
rails-html-sanitizer (1.4.3)
63-
loofah (~> 2.3)
60+
rails-html-sanitizer (1.5.0)
61+
loofah (~> 2.19, >= 2.19.1)
6462
rainbow (3.1.1)
6563
rake (13.0.6)
66-
regexp_parser (2.5.0)
64+
regexp_parser (2.6.2)
6765
rexml (3.2.5)
68-
rubocop (1.30.0)
66+
rubocop (1.44.1)
67+
json (~> 2.3)
6968
parallel (~> 1.10)
70-
parser (>= 3.1.0.0)
69+
parser (>= 3.2.0.0)
7170
rainbow (>= 2.2.2, < 4.0)
7271
regexp_parser (>= 1.8, < 3.0)
7372
rexml (>= 3.2.5, < 4.0)
74-
rubocop-ast (>= 1.18.0, < 2.0)
73+
rubocop-ast (>= 1.24.1, < 2.0)
7574
ruby-progressbar (~> 1.7)
76-
unicode-display_width (>= 1.4.0, < 3.0)
77-
rubocop-ast (1.18.0)
75+
unicode-display_width (>= 2.4.0, < 3.0)
76+
rubocop-ast (1.24.1)
7877
parser (>= 3.1.1.0)
79-
rubocop-github (0.17.0)
80-
rubocop
81-
rubocop-performance
82-
rubocop-rails
83-
rubocop-performance (1.14.2)
78+
rubocop-github (0.20.0)
79+
rubocop (>= 1.37)
80+
rubocop-performance (>= 1.15)
81+
rubocop-rails (>= 2.17)
82+
rubocop-performance (1.15.2)
8483
rubocop (>= 1.7.0, < 2.0)
8584
rubocop-ast (>= 0.4.0)
86-
rubocop-rails (2.14.2)
85+
rubocop-rails (2.17.4)
8786
activesupport (>= 4.2.0)
8887
rack (>= 1.1)
89-
rubocop (>= 1.7.0, < 2.0)
88+
rubocop (>= 1.33.0, < 2.0)
9089
ruby-progressbar (1.11.0)
90+
ruby2_keywords (0.0.5)
9191
smart_properties (1.17.0)
92-
tzinfo (2.0.4)
92+
tzinfo (2.0.5)
9393
concurrent-ruby (~> 1.0)
94-
unicode-display_width (2.1.0)
95-
zeitwerk (2.5.4)
94+
unicode-display_width (2.4.2)
9695

9796
PLATFORMS
9897
ruby
9998

10099
DEPENDENCIES
101-
erb_lint (~> 0.1.1)
100+
erb_lint (~> 0.3.0)
102101
erblint-github!
103-
minitest (~> 5.15)
104-
mocha (~> 1.14)
102+
minitest (~> 5.17.0)
103+
mocha (~> 2.0.2)
105104
rake (~> 13.0.6)
106-
rubocop (= 1.30.0)
107-
rubocop-github (~> 0.17.0)
105+
rubocop (= 1.44.1)
106+
rubocop-github (~> 0.20.0)
108107

109108
BUNDLED WITH
110-
2.2.32
109+
2.3.26

erblint-github.gemspec

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ Gem::Specification.new do |s|
1111
s.files = Dir["README.md", "LICENSE", "lib/**/*"]
1212
s.require_paths = ["lib"]
1313

14-
s.required_ruby_version = ">= 2.6.0"
14+
s.required_ruby_version = ">= 2.7.0"
1515

1616
s.email = ["[email protected]"]
1717
s.authors = ["GitHub Open Source"]
1818

19-
s.add_development_dependency "erb_lint", "~> 0.1.1"
20-
s.add_development_dependency "minitest", "~> 5.15"
21-
s.add_development_dependency "mocha", "~> 1.14"
19+
s.add_development_dependency "erb_lint", "~> 0.3.0"
20+
s.add_development_dependency "minitest", "~> 5.17.0"
21+
s.add_development_dependency "mocha", "~> 2.0.2"
2222
s.add_development_dependency "rake", "~> 13.0.6"
2323

24-
s.add_development_dependency "rubocop", "= 1.30.0"
25-
s.add_development_dependency "rubocop-github", "~> 0.17.0"
24+
s.add_development_dependency "rubocop", "= 1.44.1"
25+
s.add_development_dependency "rubocop-github", "~> 0.20.0"
2626
s.metadata["rubygems_mfa_required"] = "true"
2727
end

0 commit comments

Comments
 (0)