Merge branch 'faker-ruby:master' into master

moonproject · Sep 6, 2022 · 35ab1a1 · 35ab1a1
2 parents b7de4ea + a89b54c
commit 35ab1a1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,3 +1,6 @@
+require:
+  - rubocop-rake
+
 AllCops:
   TargetRubyVersion: 2.7
   NewCops: enable

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -13,7 +13,7 @@ GEM
     docile (1.3.2)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.3.0)
+    json (2.6.2)
     method_source (1.0.0)
     minitest (5.16.3)
     parallel (1.22.1)
@@ -27,7 +27,7 @@ GEM
     rake (13.0.6)
     regexp_parser (2.5.0)
     rexml (3.2.5)
-    rubocop (1.35.1)
+    rubocop (1.36.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
@@ -39,6 +39,8 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
     simplecov (0.17.1)
       docile (~> 1.1)
@@ -61,7 +63,8 @@ DEPENDENCIES
   minitest (= 5.16.3)
   pry (= 0.14.1)
   rake (= 13.0.6)
-  rubocop (= 1.35.1)
+  rubocop (= 1.36.0)
+  rubocop-rake (= 0.6.0)
   simplecov (= 0.17.1, < 0.18)
   test-unit (= 3.5.3)
   timecop (= 0.9.5)

diff --git a/faker.gemspec b/faker.gemspec
@@ -34,7 +34,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('minitest', '5.16.3')
   spec.add_development_dependency('pry', '0.14.1')
   spec.add_development_dependency('rake', '13.0.6')
-  spec.add_development_dependency('rubocop', '1.35.1')
+  spec.add_development_dependency('rubocop', '1.36.0')
+  spec.add_development_dependency('rubocop-rake', '0.6.0')
   # Workaround for cc-test-reporter with SimpleCov 0.18.
   # Stop upgrading SimpleCov until the following issue will be resolved.
   # https://github.com/codeclimate/test-reporter/issues/418