Merge branch 'master' into develop

This commit is contained in:
Luca Guidi 2020-07-07 08:50:32 +02:00
commit 7c7c56e895
No known key found for this signature in database
GPG Key ID: 1CC1F5EF49164B16
4 changed files with 9 additions and 11 deletions

View File

@ -2,7 +2,7 @@ source 'https://rubygems.org'
gemspec
unless ENV['CI']
gem 'byebug', require: false, platforms: :mri if RUBY_VERSION >= '2.2.0'
gem 'byebug', require: false, platforms: :mri if RUBY_VERSION >= '2.3.0'
gem 'yard', require: false
end
@ -15,6 +15,4 @@ group :inflecto do
end
gem 'gson', '>= 0.6', require: false, platforms: :jruby
gem 'rubocop', '~> 0.80.0', require: false
gem 'codecov', require: false, group: :test

View File

@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'bundler', '>= 1.6', '< 3'
spec.add_development_dependency 'rake', '~> 13'
spec.add_development_dependency 'rspec', '~> 3.7'
spec.add_development_dependency 'rspec', '~> 3.9'
spec.add_development_dependency 'rubocop', '0.81' # rubocop 0.81+ removed support for Ruby 2.3
end

View File

@ -1055,7 +1055,7 @@ module Hanami
end
class << self
private :inspect_type_error # rubocop:disable Style/AccessModifierDeclarations
private :inspect_type_error
end
end
end

View File

@ -58,12 +58,12 @@ run_test() {
}
main() {
prepare_build &&
print_ruby_version &&
run_code_quality_checks &&
run_unit_tests &&
run_isolation_tests &&
update_code_coverage
prepare_build
print_ruby_version
run_code_quality_checks
run_unit_tests
run_isolation_tests
update_code_coverage
}
main