Skip to content

Commit

Permalink
Merge pull request #11 from salsify/ms/support-rails-6
Browse files Browse the repository at this point in the history
Support Rails 6.0
  • Loading branch information
marcoserrato committed May 27, 2020
2 parents 9d39d15 + 5556479 commit 0acb785
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 2 deletions.
7 changes: 7 additions & 0 deletions .travis.yml
Expand Up @@ -5,10 +5,17 @@ gemfile:
- gemfiles/rails_5.0.gemfile
- gemfiles/rails_5.1.gemfile
- gemfiles/rails_5.2.gemfile
- gemfiles/rails_6.0.gemfile
rvm:
- 2.3.8
- 2.4.5
- 2.5.3
script:
- bundle exec rspec
- bundle exec rubocop
matrix:
exclude:
- rvm: 2.3.8
gemfile: gemfiles/rails_6.0.gemfile
- rvm: 2.4.5
gemfile: gemfiles/rails_6.0.gemfile
9 changes: 9 additions & 0 deletions Appraisals
@@ -1,21 +1,30 @@
# frozen_string_literal: true

appraise 'rails-4.2' do
gem 'sqlite3', '~> 1.3.6'
gem 'activerecord', '4.2.10'
gem 'activesupport', '4.2.10'
end

appraise 'rails-5.0' do
gem 'sqlite3', '~> 1.3.6'
gem 'activerecord', '5.0.7'
gem 'activesupport', '5.0.7'
end

appraise 'rails-5.1' do
gem 'sqlite3', '~> 1.3.6'
gem 'activerecord', '5.1.6'
gem 'activesupport', '5.1.6'
end

appraise 'rails-5.2' do
gem 'sqlite3', '~> 1.3.6'
gem 'activerecord', '5.2.1 '
gem 'activesupport', '5.2.1 '
end

appraise 'rails-6.0' do
gem 'activerecord', '6.0.3'
gem 'activesupport', '6.0.3'
end
3 changes: 3 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,8 @@
# Changelog

### 0.4.2
* Add support for Rails 6.0.

### 0.4.1
* Bugfix for `on_completion_job` and `on_cancellation_job` YAML serialization

Expand Down
2 changes: 1 addition & 1 deletion delayed_job_groups.gemspec
Expand Up @@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
spec.post_install_message = 'See https://github.com/salsify/delayed_job_groups_plugin#installation for upgrade/installation notes.'

spec.add_development_dependency 'appraisal'
spec.add_dependency 'activerecord', '>= 4.2', '< 5.3'
spec.add_dependency 'activerecord', '>= 4.2', '< 6.1'
spec.add_development_dependency 'coveralls'
spec.add_development_dependency 'database_cleaner', '>= 1.2'
spec.add_development_dependency 'mime-types'
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails_4.2.gemfile
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "sqlite3", "~> 1.3.6"
gem "activerecord", "4.2.10"
gem "activesupport", "4.2.10"

Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails_5.0.gemfile
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "sqlite3", "~> 1.3.6"
gem "activerecord", "5.0.7"
gem "activesupport", "5.0.7"

Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails_5.1.gemfile
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "sqlite3", "~> 1.3.6"
gem "activerecord", "5.1.6"
gem "activesupport", "5.1.6"

Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails_5.2.gemfile
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "sqlite3", "~> 1.3.6"
gem "activerecord", "5.2.1 "
gem "activesupport", "5.2.1 "

Expand Down
8 changes: 8 additions & 0 deletions gemfiles/rails_6.0.gemfile
@@ -0,0 +1,8 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "activerecord", "6.0.3"
gem "activesupport", "6.0.3"

gemspec path: "../"
2 changes: 1 addition & 1 deletion lib/delayed/job_groups/version.rb
Expand Up @@ -2,6 +2,6 @@

module Delayed
module JobGroups
VERSION = '0.4.1'
VERSION = '0.4.2'
end
end

0 comments on commit 0acb785

Please sign in to comment.