diff --git a/.travis.yml b/.travis.yml index 8441ab9..fbadfb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,6 +41,10 @@ matrix: gemfile: gemfiles/rails_3.2.gemfile - rvm: jruby-9.1.12.0 gemfile: gemfiles/rails_5.0.gemfile + - rvm: jruby-9.1.12.0 + gemfile: gemfiles/rails_4.2_nobrainer.gemfile + - rvm: jruby-9.1.12.0 + gemfile: gemfiles/rails_5.0_nobrainer.gemfile notifications: slack: diff --git a/Appraisals b/Appraisals index b8b95ce..7b7d7c4 100644 --- a/Appraisals +++ b/Appraisals @@ -33,7 +33,6 @@ end appraise 'rails_4.2_nobrainer' do gem 'rails', '4.2.5' gem 'nobrainer', '~> 0.33.0' - gem 'activerecord-jdbcsqlite3-adapter', '1.3.24', platforms: :jruby end appraise 'rails_4.2_mongoid_5' do diff --git a/gemfiles/rails_3.2.gemfile b/gemfiles/rails_3.2.gemfile index ec91329..2608b52 100644 --- a/gemfiles/rails_3.2.gemfile +++ b/gemfiles/rails_3.2.gemfile @@ -3,8 +3,8 @@ source "https://rubygems.org" gem "sqlite3", platforms: :ruby -gem "rails", "~>3.2.22" -gem "mongoid", "~>3.1" +gem "rails", "~> 3.2.22" +gem "mongoid", "~> 3.1" gem "sequel" gem "bson_ext", platforms: :ruby gem "test-unit", "~> 3.0" diff --git a/gemfiles/rails_4.0.gemfile b/gemfiles/rails_4.0.gemfile index 58cbbec..8f4b14b 100644 --- a/gemfiles/rails_4.0.gemfile +++ b/gemfiles/rails_4.0.gemfile @@ -5,10 +5,10 @@ source "https://rubygems.org" gem "sqlite3", platforms: :ruby gem "rails", "4.0.13" gem "mime-types", "~> 2", platforms: [:ruby_19, :jruby] -gem "mongoid", "~>4.0" +gem "mongoid", "~> 4.0" gem "sequel" gem "dynamoid", "~> 1", platforms: :ruby -gem "aws-sdk", "~>2", platforms: :ruby +gem "aws-sdk", "~> 2", platforms: :ruby gem "redis-objects" gem "activerecord-jdbcsqlite3-adapter", "1.3.24", platforms: :jruby diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile index 27de040..a099605 100644 --- a/gemfiles/rails_4.2.gemfile +++ b/gemfiles/rails_4.2.gemfile @@ -6,10 +6,10 @@ gem "sqlite3", platforms: :ruby gem "rails", "4.2.5" gem "nokogiri", "1.6.8.1", platforms: [:ruby_19] gem "mime-types", "~> 2", platforms: [:ruby_19, :jruby] -gem "mongoid", "~>4.0" +gem "mongoid", "~> 4.0" gem "sequel" gem "dynamoid", "~> 1", platforms: :ruby -gem "aws-sdk", "~>2", platforms: :ruby +gem "aws-sdk", "~> 2", platforms: :ruby gem "redis-objects" gem "activerecord-jdbcsqlite3-adapter", "1.3.24", platforms: :jruby diff --git a/gemfiles/rails_4.2_mongoid_5.gemfile b/gemfiles/rails_4.2_mongoid_5.gemfile index 809389b..117ca2a 100644 --- a/gemfiles/rails_4.2_mongoid_5.gemfile +++ b/gemfiles/rails_4.2_mongoid_5.gemfile @@ -5,7 +5,7 @@ source "https://rubygems.org" gem "sqlite3", platforms: :ruby gem "rails", "4.2.5" gem "mime-types", "~> 2", platforms: [:ruby_19, :jruby] -gem "mongoid", "~>5.0" +gem "mongoid", "~> 5.0" gem "activerecord-jdbcsqlite3-adapter", "1.3.24", platforms: :jruby gemspec path: "../" diff --git a/gemfiles/rails_4.2_nobrainer.gemfile b/gemfiles/rails_4.2_nobrainer.gemfile index 9e98000..f9292fc 100644 --- a/gemfiles/rails_4.2_nobrainer.gemfile +++ b/gemfiles/rails_4.2_nobrainer.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "sqlite3", platforms: :ruby -gem "rails", "5.1.3" -gem "nobrainer", "~>0.33.0" +gem "rails", "4.2.5" +gem "nobrainer", "~> 0.33.0" gemspec path: "../" diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile index d5c85d6..ecd9acb 100644 --- a/gemfiles/rails_5.0.gemfile +++ b/gemfiles/rails_5.0.gemfile @@ -4,10 +4,10 @@ source "https://rubygems.org" gem "sqlite3", platforms: :ruby gem "rails", "5.0.0" -gem "mongoid", "~>6.0" +gem "mongoid", "~> 6.0" gem "sequel" gem "dynamoid", "~> 1", platforms: :ruby -gem "aws-sdk", "~>2", platforms: :ruby +gem "aws-sdk", "~> 2", platforms: :ruby gem "redis-objects" gemspec path: "../" diff --git a/gemfiles/rails_5.0_nobrainer.gemfile b/gemfiles/rails_5.0_nobrainer.gemfile index 9e98000..046a0e3 100644 --- a/gemfiles/rails_5.0_nobrainer.gemfile +++ b/gemfiles/rails_5.0_nobrainer.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "sqlite3", platforms: :ruby -gem "rails", "5.1.3" -gem "nobrainer", "~>0.33.0" +gem "rails", "5.0.0" +gem "nobrainer", "~> 0.33.0" gemspec path: "../"