Skip to content

Commit

Permalink
Updated Gemspec and CI tests for compatibility with Rails 6.1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
max611 committed Sep 25, 2020
1 parent d602a5d commit 0780413
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 1 deletion.
15 changes: 15 additions & 0 deletions .travis.yml
Expand Up @@ -21,14 +21,17 @@ gemfile: # Supported
- gemfiles/mysql2/5-1.gemfile
- gemfiles/mysql2/5-2.gemfile
- gemfiles/mysql2/6-0.gemfile
- gemfiles/mysql2/6-1.gemfile
- gemfiles/postgresql/4-2.gemfile
- gemfiles/postgresql/5-1.gemfile
- gemfiles/postgresql/5-2.gemfile
- gemfiles/postgresql/6-0.gemfile
- gemfiles/postgresql/6-1.gemfile
- gemfiles/sqlite3/4-2.gemfile
- gemfiles/sqlite3/5-1.gemfile
- gemfiles/sqlite3/5-2.gemfile
- gemfiles/sqlite3/6-0.gemfile
- gemfiles/sqlite3/6-1.gemfile
rvm: # Supported
- 2.3.8
- 2.4.6
Expand All @@ -48,6 +51,18 @@ matrix:
- gemfile: gemfiles/sqlite3/master.gemfile # Future

exclude:
- gemfile: gemfiles/mysql2/6-1.gemfile
rvm: 2.3.8
- gemfile: gemfiles/mysql2/6-1.gemfile
rvm: 2.4.6
- gemfile: gemfiles/postgresql/6-1.gemfile
rvm: 2.3.8
- gemfile: gemfiles/postgresql/6-1.gemfile
rvm: 2.4.6
- gemfile: gemfiles/sqlite3/6-1.gemfile
rvm: 2.3.8
- gemfile: gemfiles/sqlite3/6-1.gemfile
rvm: 2.4.6
- gemfile: gemfiles/mysql2/6-0.gemfile
rvm: 2.3.8
- gemfile: gemfiles/mysql2/6-0.gemfile
Expand Down
2 changes: 1 addition & 1 deletion delayed_job_active_record.gemspec
@@ -1,7 +1,7 @@
# frozen_string_literal: true

Gem::Specification.new do |spec|
spec.add_dependency "activerecord", [">= 3.0", "< 6.1"]
spec.add_dependency "activerecord", [">= 3.0", "< 6.2"]
spec.add_dependency "delayed_job", [">= 3.0", "< 5"]
spec.authors = ["Brian Ryckbost", "Matt Griffin", "Erik Michaels-Ober"]
spec.description = "ActiveRecord backend for Delayed::Job, originally authored by Tobias Lütke"
Expand Down
23 changes: 23 additions & 0 deletions gemfiles/mysql2/6-1.gemfile
@@ -0,0 +1,23 @@
# frozen_string_literal: true

source "https://rubygems.org"

gem "rake"

group :test do
platforms :jruby do
gem "activerecord-jdbcmysql-adapter", ">= 60.0.rc1"
end

platforms :ruby, :mswin, :mingw do
gem "mysql2"
end

gem "coveralls", require: false
gem "rspec", ">= 2.11"
gem "simplecov", require: false

gem "activerecord", github: 'rails/rails'
end

gemspec path: "../../"
23 changes: 23 additions & 0 deletions gemfiles/postgresql/6-1.gemfile
@@ -0,0 +1,23 @@
# frozen_string_literal: true

source "https://rubygems.org"

gem "rake"

group :test do
platforms :jruby do
gem "activerecord-jdbcpostgresql-adapter", ">= 60.0.rc1"
end

platforms :ruby, :mswin, :mingw do
gem "pg", "~> 0.18"
end

gem "coveralls", require: false
gem "rspec", ">= 2.11"
gem "simplecov", require: false

gem "activerecord", github: 'rails/rails'
end

gemspec path: "../../"
23 changes: 23 additions & 0 deletions gemfiles/sqlite3/6-1.gemfile
@@ -0,0 +1,23 @@
# frozen_string_literal: true

source "https://rubygems.org"

gem "rake"

group :test do
platforms :jruby do
gem "activerecord-jdbcsqlite3-adapter", ">= 60.0.rc1"
end

platforms :ruby, :mswin, :mingw do
gem "sqlite3", "~> 1.4"
end

gem "coveralls", require: false
gem "rspec", ">= 2.11"
gem "simplecov", require: false

gem "activerecord", github: 'rails/rails'
end

gemspec path: "../../"

0 comments on commit 0780413

Please sign in to comment.