Skip to content

Commit 6ff0d38

Browse files
committed
Support for Rubocop 1.4.1
In order to support the 1.x versions of Rubocop, three additional dependencies also require upgrades: - rubocop-sequel, the update to which is already complete and released; - rubocop-i18n, the update to which is in-flight (see rubocop/rubocop-i18n#46) - rubocop-migrations, the update to which is in-flight (see redbooth/rubocop-migrations#3) The commit here will pass CI, but the in-flight PRs should be merged and released to RubyGems before merging this PR.
1 parent aa7f42c commit 6ff0d38

File tree

2 files changed

+35
-21
lines changed

2 files changed

+35
-21
lines changed

Gemfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@ gem "activesupport", require: false
66
gem "mry", require: false
77
gem "parser"
88
gem "pry", require: false
9-
gem "rubocop", "0.92.0", require: false
10-
gem "rubocop-i18n", require: false
11-
gem "rubocop-migrations", require: false
9+
gem "rubocop", "1.4.1", require: false
10+
gem "rubocop-i18n", require: false,
11+
github: "mvz/rubocop-i18n", ref: "5e824a47a88732830a8b60e46697bbb0a2795c19"
12+
gem "rubocop-migrations", require: false,
13+
github: "DanielWright/rubocop-migrations", branch: "dw/nov24/rubocop-1.x-support"
1214
gem "rubocop-minitest", require: false
1315
gem "rubocop-performance", require: false
1416
gem "rubocop-rails", require: false
1517
gem "rubocop-rake", require: false
1618
gem "rubocop-rspec", require: false
17-
gem "rubocop-sequel", require: false
19+
gem "rubocop-sequel", "0.1.0", require: false
1820
gem 'rubocop-sorbet', require: false
1921
gem "rubocop-thread_safety", require: false
2022
gem "safe_yaml"

Gemfile.lock

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
GIT
2+
remote: https://github.com/DanielWright/rubocop-migrations.git
3+
revision: a4cb61a86a272b57e7fb3dcda238519c39f2ac70
4+
branch: dw/nov24/rubocop-1.x-support
5+
specs:
6+
rubocop-migrations (0.1.2)
7+
rubocop (~> 1.0)
8+
9+
GIT
10+
remote: https://github.com/mvz/rubocop-i18n.git
11+
revision: 5e824a47a88732830a8b60e46697bbb0a2795c19
12+
ref: 5e824a47a88732830a8b60e46697bbb0a2795c19
13+
specs:
14+
rubocop-i18n (2.0.2)
15+
rubocop (~> 1.0)
16+
117
GEM
218
remote: https://rubygems.org/
319
specs:
@@ -17,16 +33,16 @@ GEM
1733
minitest (5.14.1)
1834
mry (0.78.0.0)
1935
rubocop (>= 0.41.0)
20-
parallel (1.19.2)
21-
parser (2.7.1.5)
36+
parallel (1.20.1)
37+
parser (2.7.2.0)
2238
ast (~> 2.4.1)
2339
pry (0.13.1)
2440
coderay (~> 1.1)
2541
method_source (~> 1.0)
2642
rack (2.2.3)
2743
rainbow (3.0.0)
2844
rake (13.0.1)
29-
regexp_parser (1.8.1)
45+
regexp_parser (1.8.2)
3046
rexml (3.2.4)
3147
rspec (3.9.0)
3248
rspec-core (~> 3.9.0)
@@ -41,21 +57,17 @@ GEM
4157
diff-lcs (>= 1.2.0, < 2.0)
4258
rspec-support (~> 3.9.0)
4359
rspec-support (3.9.3)
44-
rubocop (0.92.0)
60+
rubocop (1.4.1)
4561
parallel (~> 1.10)
4662
parser (>= 2.7.1.5)
4763
rainbow (>= 2.2.2, < 4.0)
48-
regexp_parser (>= 1.7)
64+
regexp_parser (>= 1.8)
4965
rexml
50-
rubocop-ast (>= 0.5.0)
66+
rubocop-ast (>= 1.1.1)
5167
ruby-progressbar (~> 1.7)
5268
unicode-display_width (>= 1.4.0, < 2.0)
53-
rubocop-ast (0.7.1)
69+
rubocop-ast (1.1.1)
5470
parser (>= 2.7.1.5)
55-
rubocop-i18n (2.0.2)
56-
rubocop (~> 0.51)
57-
rubocop-migrations (0.1.2)
58-
rubocop (~> 0.41)
5971
rubocop-minitest (0.9.0)
6072
rubocop (>= 0.74)
6173
rubocop-performance (1.7.0)
@@ -68,8 +80,8 @@ GEM
6880
rubocop
6981
rubocop-rspec (1.41.0)
7082
rubocop (>= 0.68.1)
71-
rubocop-sequel (0.0.6)
72-
rubocop (~> 0.55, >= 0.55)
83+
rubocop-sequel (0.1.0)
84+
rubocop (~> 1.0)
7385
rubocop-sorbet (0.5.1)
7486
rubocop
7587
rubocop-thread_safety (0.4.1)
@@ -93,15 +105,15 @@ DEPENDENCIES
93105
pry
94106
rake
95107
rspec
96-
rubocop (= 0.92.0)
97-
rubocop-i18n
98-
rubocop-migrations
108+
rubocop (= 1.4.1)
109+
rubocop-i18n!
110+
rubocop-migrations!
99111
rubocop-minitest
100112
rubocop-performance
101113
rubocop-rails
102114
rubocop-rake
103115
rubocop-rspec
104-
rubocop-sequel
116+
rubocop-sequel (= 0.1.0)
105117
rubocop-sorbet
106118
rubocop-thread_safety
107119
safe_yaml

0 commit comments

Comments
 (0)