diff --git a/.travis.yml b/.travis.yml index 6d6de025..6000c012 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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 diff --git a/delayed_job_active_record.gemspec b/delayed_job_active_record.gemspec index 8b2ebb96..7a6a7bbc 100644 --- a/delayed_job_active_record.gemspec +++ b/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" diff --git a/gemfiles/mysql2/6-1.gemfile b/gemfiles/mysql2/6-1.gemfile new file mode 100644 index 00000000..d76a88c8 --- /dev/null +++ b/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: "../../" diff --git a/gemfiles/postgresql/6-1.gemfile b/gemfiles/postgresql/6-1.gemfile new file mode 100644 index 00000000..33179892 --- /dev/null +++ b/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: "../../" diff --git a/gemfiles/sqlite3/6-1.gemfile b/gemfiles/sqlite3/6-1.gemfile new file mode 100644 index 00000000..29b16b61 --- /dev/null +++ b/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: "../../"