Skip to content

Commit

Permalink
Upgrade development dependencies and test matrix with latest Ruby and…
Browse files Browse the repository at this point in the history
… Rails versions (#264)
  • Loading branch information
pkuczynski authored Jan 4, 2020
1 parent ab7039f commit 41fb16b
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 19 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ language: ruby
cache: bundler
sudo: false
rvm:
- 2.4.5
- 2.5.3
- 2.6.0
- 2.4.9
- 2.5.7
- 2.6.5
- 2.7.0
- truffleruby
gemfile:
Expand Down
10 changes: 5 additions & 5 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
appraise 'rails-4.2' do
gem 'rails', '4.2.11'
gem 'rails', '4.2.11.1'
gem 'rspec-rails', '~> 3.7'
gem 'sprockets', '~> 3.7'
gem 'sqlite3', '< 1.4.0'
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
end

appraise 'rails-5.0' do
gem 'rails', '5.0.7.1'
gem 'rails', '5.0.7.2'
gem 'rspec-rails', '~> 3.7'
gem 'sqlite3', '< 1.4.0'
end

appraise 'rails-5.1' do
gem 'rails', '5.1.6.1'
gem 'rails', '5.1.7'
gem 'rspec-rails', '~> 3.7'
gem 'sqlite3', '< 1.4.0'
end

appraise 'rails-5.2' do
gem 'bootsnap', '~> 1.4'
gem 'rails', '5.2.2'
gem 'rails', '5.2.4.1'
gem 'rspec-rails', '~> 3.7'
gem 'sqlite3', '< 1.4.0'
end

appraise 'sinatra' do
gem 'sinatra', '2.0.5'
gem 'sinatra', '2.0.8.1'
end
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* Use sprockets 3.x when running unit tests for Rails 4.2 ([#256](https://github.com/railsconfig/config/pull/256))
* Cleanup example Rails application used for testing ([#263](https://github.com/railsconfig/config/pull/263))
* Upgrade markdown linter and fix errors ([#265](https://github.com/railsconfig/config/pull/265))
* Upgrade development dependencies and test matrix with latest Ruby and Rails versions ([#264](https://github.com/railsconfig/config/pull/264))

## 2.1.0

Expand Down Expand Up @@ -67,7 +68,7 @@ If you need older version of Ruby or Rails, please stick to 1.x version of this
### Changes

* Add Ruby 2.5 and Rails 5.1 to the testing matrix on Travis ([#201](https://github.com/railsconfig/config/pull/201))
* Add Ruby 2.6 tto the test matrix ([#210](https://github.com/railsconfig/config/pull/210))
* Add Ruby 2.6 to the test matrix ([#210](https://github.com/railsconfig/config/pull/210))
* Add Rails 5.2 to the test matrix ([#212](https://github.com/railsconfig/config/pull/212))

## 1.7.0
Expand Down
8 changes: 3 additions & 5 deletions config.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Please consider donating to our open collective to help us maintain this project
s.required_ruby_version = '>= 2.4.0'

s.add_dependency 'deep_merge', '~> 1.2', '>= 1.2.1'
s.add_dependency 'dry-validation', '~> 1.0'
s.add_dependency 'dry-validation', '~> 1.0', '>= 1.0.0'

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

Expand All @@ -45,12 +45,10 @@ Please consider donating to our open collective to help us maintain this project

# Static code analysis
s.add_development_dependency 'mdl', '~> 0.8', '>= 0.8.0'

# Version 0.62 requires Ruby 2.2
s.add_development_dependency 'rubocop', '~> 0.62'
s.add_development_dependency 'rubocop', '~> 0.78.0'

if ENV['TRAVIS'] && ENV['TRAVIS_RUBY_VERSION'] != 'truffleruby'
s.add_development_dependency 'codeclimate-test-reporter', '~> 1.0.9'
s.add_development_dependency 'simplecov', '~> 0.13.0'
s.add_development_dependency 'simplecov', '~> 0.13'
end
end
2 changes: 1 addition & 1 deletion gemfiles/rails_4.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

gem "rails", "4.2.11"
gem "rails", "4.2.11.1"
gem "rspec-rails", "~> 3.7"
gem "sprockets", "~> 3.7"
gem "sqlite3", "< 1.4.0"
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_5.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

gem "rails", "5.0.7.1"
gem "rails", "5.0.7.2"
gem "rspec-rails", "~> 3.7"
gem "sqlite3", "< 1.4.0"

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_5.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

gem "rails", "5.1.6.1"
gem "rails", "5.1.7"
gem "rspec-rails", "~> 3.7"
gem "sqlite3", "< 1.4.0"

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_5.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"

gem "bootsnap", "~> 1.4"
gem "rails", "5.2.2"
gem "rails", "5.2.4.1"
gem "rspec-rails", "~> 3.7"
gem "sqlite3", "< 1.4.0"

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/sinatra.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

source "https://rubygems.org"

gem "sinatra", "2.0.5"
gem "sinatra", "2.0.8.1"

gemspec path: "../"

0 comments on commit 41fb16b

Please sign in to comment.