Skip to content

Commit 5b2d297

Browse files
committed
Upgrade development dependencies and test matrix with latest Ruby and Rails versions
1 parent ef4ccfb commit 5b2d297

File tree

9 files changed

+22
-17
lines changed

9 files changed

+22
-17
lines changed

.travis.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ language: ruby
22
cache: bundler
33
sudo: false
44
rvm:
5-
- 2.4.5
6-
- 2.5.3
7-
- 2.6.0
5+
- 2.4.9
6+
- 2.5.7
7+
- 2.6.5
8+
- 2.7.0
89
- truffleruby
910
gemfile:
1011
- gemfiles/rails_4.2.gemfile
@@ -14,7 +15,10 @@ gemfile:
1415
- gemfiles/sinatra.gemfile
1516
matrix:
1617
exclude:
17-
# truffleruby does not seem to work with Rails
18+
# Bundler 2.x coming with Ruby 2.7 does not work well with rails 4.2
19+
- rvm: 2.7.0
20+
gemfile: gemfiles/rails_4.2.gemfile
21+
# TruffleRuby does not seem to work with Rails
1822
- rvm: truffleruby
1923
gemfile: gemfiles/rails_4.2.gemfile
2024
- rvm: truffleruby

Appraisals

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
appraise 'rails-4.2' do
2-
gem 'rails', '4.2.11'
2+
gem 'rails', '4.2.11.1'
33
gem 'rspec-rails', '~> 3.7'
44
gem 'sprockets', '~> 3.7'
55
gem 'sqlite3', '< 1.4.0'
66
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
77
end
88

99
appraise 'rails-5.0' do
10-
gem 'rails', '5.0.7.1'
10+
gem 'rails', '5.0.7.2'
1111
gem 'rspec-rails', '~> 3.7'
1212
gem 'sqlite3', '< 1.4.0'
1313
end
1414

1515
appraise 'rails-5.1' do
16-
gem 'rails', '5.1.6.1'
16+
gem 'rails', '5.1.7'
1717
gem 'rspec-rails', '~> 3.7'
1818
gem 'sqlite3', '< 1.4.0'
1919
end
2020

2121
appraise 'rails-5.2' do
2222
gem 'bootsnap', '~> 1.4'
23-
gem 'rails', '5.2.2'
23+
gem 'rails', '5.2.4.1'
2424
gem 'rspec-rails', '~> 3.7'
2525
gem 'sqlite3', '< 1.4.0'
2626
end
2727

2828
appraise 'sinatra' do
29-
gem 'sinatra', '2.0.5'
29+
gem 'sinatra', '2.0.8.1'
3030
end

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
* Use sprockets 3.x when running unit tests for Rails 4.2 ([#256](https://github.com/railsconfig/config/pull/256))
1212
* Cleanup example Rails application used for testing ([#263](https://github.com/railsconfig/config/pull/263))
13+
* Upgrade development dependencies and test matrix with latest Ruby and Rails versions
1314

1415
## 2.1.0
1516

config.gemspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Please consider donating to our open collective to help us maintain this project
2828
s.required_ruby_version = '>= 2.4.0'
2929

3030
s.add_dependency 'deep_merge', '~> 1.2', '>= 1.2.1'
31-
s.add_dependency 'dry-validation', '~> 1.0'
31+
s.add_dependency 'dry-validation', '~> 1.4.0'
3232

3333
s.add_development_dependency 'rake', '~> 12.0', '>= 12.0.0'
3434

@@ -47,10 +47,10 @@ Please consider donating to our open collective to help us maintain this project
4747
s.add_development_dependency 'mdl', '~> 0.5', '>= 0.5.0'
4848

4949
# Version 0.62 requires Ruby 2.2
50-
s.add_development_dependency 'rubocop', '~> 0.62'
50+
s.add_development_dependency 'rubocop', '~> 0.78.0'
5151

5252
if ENV['TRAVIS'] && ENV['TRAVIS_RUBY_VERSION'] != 'truffleruby'
5353
s.add_development_dependency 'codeclimate-test-reporter', '~> 1.0.9'
54-
s.add_development_dependency 'simplecov', '~> 0.13.0'
54+
s.add_development_dependency 'simplecov', '~> 0.17.1'
5555
end
5656
end

gemfiles/rails_4.2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "rails", "4.2.11"
5+
gem "rails", "4.2.11.1"
66
gem "rspec-rails", "~> 3.7"
77
gem "sprockets", "~> 3.7"
88
gem "sqlite3", "< 1.4.0"

gemfiles/rails_5.0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "rails", "5.0.7.1"
5+
gem "rails", "5.0.7.2"
66
gem "rspec-rails", "~> 3.7"
77
gem "sqlite3", "< 1.4.0"
88

gemfiles/rails_5.1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "rails", "5.1.6.1"
5+
gem "rails", "5.1.7"
66
gem "rspec-rails", "~> 3.7"
77
gem "sqlite3", "< 1.4.0"
88

gemfiles/rails_5.2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "bootsnap", "~> 1.4"
6-
gem "rails", "5.2.2"
6+
gem "rails", "5.2.4.1"
77
gem "rspec-rails", "~> 3.7"
88
gem "sqlite3", "< 1.4.0"
99

gemfiles/sinatra.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
source "https://rubygems.org"
44

5-
gem "sinatra", "2.0.5"
5+
gem "sinatra", "2.0.8.1"
66

77
gemspec path: "../"

0 commit comments

Comments
 (0)