Remove Ruby 2.4 and add Ruby 2.7 (#172)

kslazarev · Apr 1, 2020 · 8b47fc6 · 8b47fc6
1 parent 0538e66
commit 8b47fc6
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,9 +14,9 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - ruby:2.4
           - ruby:2.5
           - ruby:2.6
+          - ruby:2.7
           - jruby
         include:
           - image: ruby:rc

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -5,7 +5,7 @@ require:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   Exclude:
     - 'numbers_and_words.gemspec'
 
@@ -15,7 +15,16 @@ Style/AsciiComments:
 Style/Documentation:
   Enabled: false
 
-Metrics/LineLength:
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Layout/LineLength:
   Enabled: false
 
 Naming/FileName:

diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - jruby
diff --git a/Gemfile b/Gemfile
@@ -12,7 +12,7 @@ end
 group :test do
   gem 'coveralls', require: false
   gem 'rspec', '~> 3'
-  gem 'rubocop', '~> 0.69.0', require: false
+  gem 'rubocop', require: false
   gem 'rubocop-performance', require: false
   gem 'rubocop-rspec', require: false
 end
diff --git a/Rakefile b/Rakefile
@@ -16,7 +16,7 @@ Jeweler::Tasks.new do |gem|
   gem.version = NumbersAndWords::VERSION
   gem.authors = ['Kirill Lazarev']
   gem.files = Dir.glob('lib/**/*')
-  gem.required_ruby_version = '>= 2.4.0'
+  gem.required_ruby_version = '>= 2.5.0'
 end
 
 Jeweler::RubygemsDotOrgTasks.new

diff --git a/lib/numbers_and_words/i18n/pluralization.rb b/lib/numbers_and_words/i18n/pluralization.rb
@@ -14,7 +14,7 @@ module Pluralization
 
       def init
         ::I18n.load_path << config_file
-        ::I18n::Backend::Simple.send :include, ::I18n::Backend::Pluralization
+        ::I18n::Backend::Simple.include ::I18n::Backend::Pluralization
       end
 
       def files

diff --git a/lib/numbers_and_words/translations/base.rb b/lib/numbers_and_words/translations/base.rb
@@ -6,7 +6,7 @@ class Base
       I18N_NAMESPACE = :numbers
 
       def t(attribute, options = {})
-        ::I18n.t attribute, options.merge(scope: I18N_NAMESPACE)
+        ::I18n.t attribute, **options.merge(scope: I18N_NAMESPACE)
       end
     end
   end