Skip to content

Commit

Permalink
Merge pull request #3337 from nebulab/kennyadsl/bump-required-ruby-ve…
Browse files Browse the repository at this point in the history
…rsion

Bump required ruby version to 2.4
  • Loading branch information
kennyadsl authored Oct 3, 2019
2 parents 58533d2 + 699e7a4 commit 2a6d943
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 8 deletions.
1 change: 1 addition & 0 deletions .hound.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ruby:
config_file: .rubocop.yml
version: 0.72.0
erb_lint:
enabled: true
scss:
Expand Down
7 changes: 6 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
# Relaxed.Ruby.Style

require:
- rubocop-performance
- rubocop-rails

AllCops:
Exclude:
- 'vendor/**/*'
- '**/vendor/**/*'
- '*/spec/dummy/**/*'
- 'sandbox/**/*'
- '**/templates/**/*'
TargetRubyVersion: 2.3
- 'guides/node_modules/**/*'
TargetRubyVersion: 2.4

# Sometimes I believe this reads better
# This also causes spacing issues on multi-line fixes
Expand Down
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ group :utils do
gem 'pry'
gem 'launchy', require: false
gem 'i18n-tasks', '~> 0.9', require: false
gem 'rubocop', '~> 0.53.0', require: false
gem 'rubocop', '~> 0.72', require: false
gem 'rubocop-performance', '~> 1.4', require: false
gem 'rubocop-rails', '~> 2.3', require: false
gem 'gem-release', require: false
end

Expand Down
2 changes: 1 addition & 1 deletion api/solidus_api.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
gem.require_paths = ["lib"]
gem.version = Spree.solidus_version

gem.required_ruby_version = '>= 2.2.2'
gem.required_ruby_version = '>= 2.4.0'
gem.required_rubygems_version = '>= 1.8.23'

gem.add_dependency 'jbuilder', '~> 2.8'
Expand Down
2 changes: 1 addition & 1 deletion backend/solidus_backend.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.require_path = 'lib'
s.requirements << 'none'

s.required_ruby_version = '>= 2.2.2'
s.required_ruby_version = '>= 2.4.0'
s.required_rubygems_version = '>= 1.8.23'

s.add_dependency 'solidus_api', s.version
Expand Down
2 changes: 1 addition & 1 deletion core/solidus_core.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Gem::Specification.new do |s|
s.files = `git ls-files`.split("\n")
s.require_path = 'lib'

s.required_ruby_version = '>= 2.2.2'
s.required_ruby_version = '>= 2.4.0'
s.required_rubygems_version = '>= 1.8.23'

%w[
Expand Down
2 changes: 1 addition & 1 deletion frontend/solidus_frontend.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.require_path = 'lib'
s.requirements << 'none'

s.required_ruby_version = '>= 2.2.2'
s.required_ruby_version = '>= 2.4.0'
s.required_rubygems_version = '>= 1.8.23'

s.add_dependency 'solidus_api', s.version
Expand Down
2 changes: 1 addition & 1 deletion sample/solidus_sample.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.require_path = 'lib'
s.requirements << 'none'

s.required_ruby_version = '>= 2.2.2'
s.required_ruby_version = '>= 2.4.0'
s.required_rubygems_version = '>= 1.8.23'

s.add_dependency 'solidus_core', s.version
Expand Down
2 changes: 1 addition & 1 deletion solidus.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Gem::Specification.new do |s|
s.require_path = 'lib'
s.requirements << 'none'

s.required_ruby_version = '>= 2.2.2'
s.required_ruby_version = '>= 2.4.0'
s.required_rubygems_version = '>= 1.8.23'

s.author = 'Solidus Team'
Expand Down

0 comments on commit 2a6d943

Please sign in to comment.