diff --git a/.travis.yml b/.travis.yml index 4aa22cf1..e619a26b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,15 +11,21 @@ gemfile: - gemfiles/mysql/3-1.gemfile - gemfiles/mysql/3-2.gemfile - gemfiles/mysql/4-0.gemfile + - gemfiles/mysql/4-1.gemfile + - gemfiles/mysql/4-2.gemfile - gemfiles/postgresql/3-0.gemfile - gemfiles/postgresql/3-1.gemfile - gemfiles/postgresql/3-2.gemfile - gemfiles/postgresql/4-0.gemfile + - gemfiles/postgresql/4-1.gemfile + - gemfiles/postgresql/4-2.gemfile - gemfiles/sqlite3/3-0.gemfile - gemfiles/sqlite3/3-1.gemfile - gemfiles/sqlite3/3-2.gemfile - gemfiles/sqlite3/4-0.gemfile - gemfiles/sqlite3/4-0-protected_attributes.gemfile + - gemfiles/sqlite3/4-1.gemfile + - gemfiles/sqlite3/4-2.gemfile rvm: - 1.9.3 - 2.0.0 @@ -34,4 +40,20 @@ matrix: - rvm: jruby-head - rvm: rbx-2 - rvm: ruby-head + - gemfile: gemfiles/mysql/4-2.gemfile + - gemfile: gemfiles/postgresql/4-2.gemfile + - gemfile: gemfiles/sqlite3/4-2.gemfile + exclude: + - gemfile: gemfiles/mysql/4-1.gemfile + rvm: 1.9.3 + - gemfile: gemfiles/mysql/4-2.gemfile + rvm: 1.9.3 + - gemfile: gemfiles/postgresql/4-1.gemfile + rvm: 1.9.3 + - gemfile: gemfiles/postgresql/4-2.gemfile + rvm: 1.9.3 + - gemfile: gemfiles/sqlite3/4-1.gemfile + rvm: 1.9.3 + - gemfile: gemfiles/sqlite3/4-2.gemfile + rvm: 1.9.3 sudo: false diff --git a/gemfiles/mysql/4-0.gemfile b/gemfiles/mysql/4-0.gemfile index 93289164..d940f0cf 100644 --- a/gemfiles/mysql/4-0.gemfile +++ b/gemfiles/mysql/4-0.gemfile @@ -17,9 +17,7 @@ group :test do gem 'rspec', '>= 2.11' gem 'simplecov', :require => false - gem 'activerecord', "~> 4.0.0.beta" - - gem 'delayed_job', "~> 4.0.0.beta" + gem 'activerecord', "~> 4.0.0" end gemspec :path => "../../" diff --git a/gemfiles/mysql/4-1.gemfile b/gemfiles/mysql/4-1.gemfile new file mode 100644 index 00000000..23ecb103 --- /dev/null +++ b/gemfiles/mysql/4-1.gemfile @@ -0,0 +1,23 @@ +source 'https://rubygems.org' + +gem 'rake' + +group :test do + platforms :jruby do + gem 'activerecord-jdbc-adapter' + gem 'activerecord-jdbcmysql-adapter' + gem 'jdbc-mysql' + end + + platforms :ruby, :mswin, :mingw do + gem 'mysql', '~> 2.9' + end + + gem 'coveralls', :require => false + gem 'rspec', '>= 2.11' + gem 'simplecov', :require => false + + gem 'activerecord', "~> 4.1.0" +end + +gemspec :path => "../../" diff --git a/gemfiles/mysql/4-2.gemfile b/gemfiles/mysql/4-2.gemfile new file mode 100644 index 00000000..044ab002 --- /dev/null +++ b/gemfiles/mysql/4-2.gemfile @@ -0,0 +1,23 @@ +source 'https://rubygems.org' + +gem 'rake' + +group :test do + platforms :jruby do + gem 'activerecord-jdbc-adapter' + gem 'activerecord-jdbcmysql-adapter' + gem 'jdbc-mysql' + end + + platforms :ruby, :mswin, :mingw do + gem 'mysql', '~> 2.9' + end + + gem 'coveralls', :require => false + gem 'rspec', '>= 2.11' + gem 'simplecov', :require => false + + gem 'activerecord', "~> 4.2.0.beta1" +end + +gemspec :path => "../../" diff --git a/gemfiles/postgresql/4-0.gemfile b/gemfiles/postgresql/4-0.gemfile index fd576bc7..fd4fa9f9 100644 --- a/gemfiles/postgresql/4-0.gemfile +++ b/gemfiles/postgresql/4-0.gemfile @@ -17,9 +17,7 @@ group :test do gem 'rspec', '>= 2.11' gem 'simplecov', :require => false - gem 'activerecord', "~> 4.0.0.beta" - - gem 'delayed_job', "~> 4.0.0.beta" + gem 'activerecord', "~> 4.0.0" end gemspec :path => "../../" diff --git a/gemfiles/postgresql/4-1.gemfile b/gemfiles/postgresql/4-1.gemfile new file mode 100644 index 00000000..e48e1ce0 --- /dev/null +++ b/gemfiles/postgresql/4-1.gemfile @@ -0,0 +1,23 @@ +source 'https://rubygems.org' + +gem 'rake' + +group :test do + platforms :jruby do + gem 'activerecord-jdbc-adapter' + gem 'activerecord-jdbcpostgresql-adapter' + gem 'jdbc-postgres' + end + + platforms :ruby, :mswin, :mingw do + gem 'pg' + end + + gem 'coveralls', :require => false + gem 'rspec', '>= 2.11' + gem 'simplecov', :require => false + + gem 'activerecord', "~> 4.1.0" +end + +gemspec :path => "../../" diff --git a/gemfiles/postgresql/4-2.gemfile b/gemfiles/postgresql/4-2.gemfile new file mode 100644 index 00000000..96004483 --- /dev/null +++ b/gemfiles/postgresql/4-2.gemfile @@ -0,0 +1,23 @@ +source 'https://rubygems.org' + +gem 'rake' + +group :test do + platforms :jruby do + gem 'activerecord-jdbc-adapter' + gem 'activerecord-jdbcpostgresql-adapter' + gem 'jdbc-postgres' + end + + platforms :ruby, :mswin, :mingw do + gem 'pg' + end + + gem 'coveralls', :require => false + gem 'rspec', '>= 2.11' + gem 'simplecov', :require => false + + gem 'activerecord', "~> 4.2.0.beta1" +end + +gemspec :path => "../../" diff --git a/gemfiles/sqlite3/4-0.gemfile b/gemfiles/sqlite3/4-0.gemfile index 3b70d1b9..56f48960 100644 --- a/gemfiles/sqlite3/4-0.gemfile +++ b/gemfiles/sqlite3/4-0.gemfile @@ -17,9 +17,7 @@ group :test do gem 'rspec', '>= 2.11' gem 'simplecov', :require => false - gem 'activerecord', "~> 4.0.0.beta" - - gem 'delayed_job', "~> 4.0.0.beta" + gem 'activerecord', "~> 4.0.0" end gemspec :path => "../../" diff --git a/gemfiles/sqlite3/4-1.gemfile b/gemfiles/sqlite3/4-1.gemfile new file mode 100644 index 00000000..bf2f38a6 --- /dev/null +++ b/gemfiles/sqlite3/4-1.gemfile @@ -0,0 +1,23 @@ +source 'https://rubygems.org' + +gem 'rake' + +group :test do + platforms :jruby do + gem 'jruby-openssl' + gem 'activerecord-jdbc-adapter' + 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', "~> 4.1.0" +end + +gemspec :path => "../../" diff --git a/gemfiles/sqlite3/4-2.gemfile b/gemfiles/sqlite3/4-2.gemfile new file mode 100644 index 00000000..9355202e --- /dev/null +++ b/gemfiles/sqlite3/4-2.gemfile @@ -0,0 +1,23 @@ +source 'https://rubygems.org' + +gem 'rake' + +group :test do + platforms :jruby do + gem 'jruby-openssl' + gem 'activerecord-jdbc-adapter' + 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', "~> 4.2.0.beta1" +end + +gemspec :path => "../../"