Skip to content

Commit

Permalink
Allow Active Record 5.2 to be used
Browse files Browse the repository at this point in the history
Also bump the Ruby versions tested against.
  • Loading branch information
pixeltrix committed Apr 11, 2018
1 parent a98dbac commit ccd1345
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 39 deletions.
83 changes: 45 additions & 38 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,19 @@ gemfile: # Supported
- gemfiles/mysql2/4-2.gemfile
- gemfiles/mysql2/5-0.gemfile
- gemfiles/mysql2/5-1.gemfile
- gemfiles/mysql2/5-2.gemfile
- gemfiles/postgresql/4-2.gemfile
- gemfiles/postgresql/5-0.gemfile
- gemfiles/postgresql/5-1.gemfile
- gemfiles/postgresql/5-2.gemfile
- gemfiles/sqlite3/4-2.gemfile
- gemfiles/sqlite3/5-0.gemfile
- gemfiles/sqlite3/5-1.gemfile
- gemfiles/sqlite3/5-2.gemfile
rvm: # Supported
- 2.2.9
- 2.3.6
- 2.4.3
- 2.2.10
- 2.3.7
- 2.4.4
- jruby-9.1.8.0

jdk: oraclejdk8
Expand All @@ -42,82 +45,86 @@ matrix:
# https://github.com/jruby/activerecord-jdbc-adapter/issues/700
- rvm: jruby-9.1.8.0
gemfile: gemfiles/mysql2/5-1.gemfile
- rvm: jruby-9.1.8.0
gemfile: gemfiles/mysql2/5-2.gemfile
- rvm: jruby-9.1.8.0
gemfile: gemfiles/postgresql/5-1.gemfile
- rvm: jruby-9.1.8.0
gemfile: gemfiles/postgresql/5-2.gemfile

include:
#
# Rubocop
#
- rvm: 2.5.0
- rvm: 2.5.1
gemfile: Gemfile
env:
- COMMAND=rubocop
#
# The future
#
# MRI 2.5.0
- rvm: 2.5.0
gemfile: gemfiles/mysql2/5-1.gemfile
- rvm: 2.5.0
gemfile: gemfiles/postgresql/5-1.gemfile
- rvm: 2.5.0
gemfile: gemfiles/sqlite3/5-1.gemfile
# MRI 2.5.1
- rvm: 2.5.1
gemfile: gemfiles/mysql2/5-2.gemfile
- rvm: 2.5.1
gemfile: gemfiles/postgresql/5-2.gemfile
- rvm: 2.5.1
gemfile: gemfiles/sqlite3/5-2.gemfile
# Active Record head
- gemfile: gemfiles/mysql2/master.gemfile
rvm: 2.4.3
- gemfile: gemfiles/postgresql/master.gemfile
rvm: 2.4.3
- gemfile: gemfiles/sqlite3/master.gemfile
rvm: 2.4.3
- rvm: 2.5.1
gemfile: gemfiles/mysql2/master.gemfile
- rvm: 2.5.1
gemfile: gemfiles/postgresql/master.gemfile
- rvm: 2.5.1
gemfile: gemfiles/sqlite3/master.gemfile
# MRI Ruby head
- rvm: ruby-head
gemfile: gemfiles/mysql2/5-1.gemfile
gemfile: gemfiles/mysql2/5-2.gemfile
- rvm: ruby-head
gemfile: gemfiles/postgresql/5-1.gemfile
gemfile: gemfiles/postgresql/5-2.gemfile
- rvm: ruby-head
gemfile: gemfiles/sqlite3/5-1.gemfile
gemfile: gemfiles/sqlite3/5-2.gemfile
# JRuby head
- rvm: jruby-head
gemfile: gemfiles/mysql2/5-1.gemfile
gemfile: gemfiles/mysql2/5-2.gemfile
- rvm: jruby-head
gemfile: gemfiles/postgresql/5-1.gemfile
gemfile: gemfiles/postgresql/5-2.gemfile
- rvm: jruby-head
gemfile: gemfiles/sqlite3/5-1.gemfile
gemfile: gemfiles/sqlite3/5-2.gemfile
#
# The past
#
# EOL Active Record
- gemfile: gemfiles/mysql2/3-0.gemfile
rvm: 2.2.9
rvm: 2.2.10
- gemfile: gemfiles/mysql2/3-1.gemfile
rvm: 2.2.9
rvm: 2.2.10
- gemfile: gemfiles/mysql2/3-2.gemfile
rvm: 2.2.9
rvm: 2.2.10
- gemfile: gemfiles/mysql2/4-0.gemfile
rvm: 2.3.6
rvm: 2.3.7
- gemfile: gemfiles/mysql2/4-1.gemfile
rvm: 2.3.6
rvm: 2.3.7
- gemfile: gemfiles/postgresql/3-0.gemfile
rvm: 2.2.9
rvm: 2.2.10
- gemfile: gemfiles/postgresql/3-1.gemfile
rvm: 2.2.9
rvm: 2.2.10
- gemfile: gemfiles/postgresql/3-2.gemfile
rvm: 2.2.9
rvm: 2.2.10
- gemfile: gemfiles/postgresql/4-0.gemfile
rvm: 2.3.6
rvm: 2.3.7
- gemfile: gemfiles/postgresql/4-1.gemfile
rvm: 2.3.6
rvm: 2.3.7
- gemfile: gemfiles/sqlite3/3-0.gemfile
rvm: 2.2.9
rvm: 2.2.10
- gemfile: gemfiles/sqlite3/3-1.gemfile
rvm: 2.2.9
rvm: 2.2.10
- gemfile: gemfiles/sqlite3/3-2.gemfile
rvm: 2.2.9
rvm: 2.2.10
- gemfile: gemfiles/sqlite3/4-0.gemfile
rvm: 2.3.6
rvm: 2.3.7
- gemfile: gemfiles/sqlite3/4-1.gemfile
rvm: 2.3.6
rvm: 2.3.7
#
# The parallel dimension
#
Expand Down
2 changes: 1 addition & 1 deletion delayed_job_active_record.gemspec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Gem::Specification.new do |spec|
spec.add_dependency "activerecord", [">= 3.0", "< 5.2"]
spec.add_dependency "activerecord", [">= 3.0", "< 6.0"]
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
21 changes: 21 additions & 0 deletions gemfiles/mysql2/5-2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
source 'https://rubygems.org'

gem 'rake'

group :test do
platforms :jruby do
gem 'activerecord-jdbcmysql-adapter'
end

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

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

gem 'activerecord', "~> 5.2.0"
end

gemspec :path => "../../"
21 changes: 21 additions & 0 deletions gemfiles/postgresql/5-2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
source 'https://rubygems.org'

gem 'rake'

group :test do
platforms :jruby do
gem 'activerecord-jdbcpostgresql-adapter'
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', "~> 5.2.0"
end

gemspec :path => "../../"
21 changes: 21 additions & 0 deletions gemfiles/sqlite3/5-2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
source 'https://rubygems.org'

gem 'rake'

group :test do
platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter'
end

platforms :ruby, :mswin, :mingw do
gem 'sqlite3'
end

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

gem 'activerecord', "~> 5.2.0"
end

gemspec :path => "../../"

0 comments on commit ccd1345

Please sign in to comment.