diff --git a/.travis.yml b/.travis.yml index c6e88e9..7184ca6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,17 +3,28 @@ rvm: - jruby-19mode - 2.0.0 - 2.1.0 + - 2.2.0 matrix: allow_failures: - gemfile: gemfiles/AR_edge.gemfile + exclude: + - gemfile: gemfiles/AR_3.2.gemfile + rvm: 2.2.0 + - gemfile: gemfiles/Rails_3.2.gemfile + rvm: 2.2.0 + gemfile: - gemfiles/AR_3.2.gemfile - - gemfiles/AR_4.gemfile + - gemfiles/AR_4.0.gemfile + - gemfiles/AR_4.1.gemfile + - gemfiles/AR_4.2.gemfile - gemfiles/AR_edge.gemfile - gemfiles/Rails_3.2.gemfile - - gemfiles/Rails_4.gemfile + - gemfiles/Rails_4.0.gemfile + - gemfiles/Rails_4.1.gemfile + - gemfiles/Rails_4.2.gemfile - gemfiles/Sequel.gemfile script: bundle exec rspec diff --git a/gemfiles/AR_4.gemfile b/gemfiles/AR_4.0.gemfile similarity index 100% rename from gemfiles/AR_4.gemfile rename to gemfiles/AR_4.0.gemfile diff --git a/gemfiles/AR_4.1.gemfile b/gemfiles/AR_4.1.gemfile index 46abe2e..241b36e 100644 --- a/gemfiles/AR_4.1.gemfile +++ b/gemfiles/AR_4.1.gemfile @@ -12,7 +12,7 @@ gem "appraisal", :github=>"thoughtbot/appraisal" gem "sqlite3", :platform=>:ruby gem "jdbc-sqlite3", :platform=>:jruby, :require=>"jdbc/sqlite3" gem "ruby-prof", :platform=>:ruby -gem "activerecord", "4.1.0.rc1", :require=>"active_record" +gem "activerecord", "4.1", :require=>"active_record" gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby, :github=>"jruby/activerecord-jdbc-adapter" gemspec :path=>".././" diff --git a/gemfiles/AR_4.2.gemfile b/gemfiles/AR_4.2.gemfile new file mode 100644 index 0000000..df9e780 --- /dev/null +++ b/gemfiles/AR_4.2.gemfile @@ -0,0 +1,18 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rake" +gem "colored" +gem "pry" +gem "rspec" +gem "simplecov", :require=>false +gem "simplecov-summary" +gem "appraisal", :github=>"thoughtbot/appraisal" +gem "sqlite3", :platform=>:ruby +gem "jdbc-sqlite3", :platform=>:jruby, :require=>"jdbc/sqlite3" +gem "ruby-prof", :platform=>:ruby +gem "activerecord", "4.2", :require=>"active_record" +gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby, :github=>"jruby/activerecord-jdbc-adapter" + +gemspec :path=>".././" diff --git a/gemfiles/Rails_4.gemfile b/gemfiles/Rails_4.0.gemfile similarity index 96% rename from gemfiles/Rails_4.gemfile rename to gemfiles/Rails_4.0.gemfile index b5d3cc9..303c24f 100644 --- a/gemfiles/Rails_4.gemfile +++ b/gemfiles/Rails_4.0.gemfile @@ -13,7 +13,7 @@ gem "sqlite3", :platform=>:ruby gem "jdbc-sqlite3", :platform=>:jruby, :require=>"jdbc/sqlite3" gem "ruby-prof", :platform=>:ruby gem "combustion", :github=>"pat/combustion", :ref=>"50a946b5a7ab3d9249f0e5fcebbb73488a91b1e5" -gem "rails", "4.0.0" +gem "rails", "4.0" gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby, :github=>"jruby/activerecord-jdbc-adapter" gemspec :path=>".././" diff --git a/gemfiles/Rails_4.1.gemfile b/gemfiles/Rails_4.1.gemfile new file mode 100644 index 0000000..1e11d03 --- /dev/null +++ b/gemfiles/Rails_4.1.gemfile @@ -0,0 +1,19 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rake" +gem "colored" +gem "pry" +gem "rspec" +gem "simplecov", :require=>false +gem "simplecov-summary" +gem "appraisal", :github=>"thoughtbot/appraisal" +gem "sqlite3", :platform=>:ruby +gem "jdbc-sqlite3", :platform=>:jruby, :require=>"jdbc/sqlite3" +gem "ruby-prof", :platform=>:ruby +gem "combustion", :github=>"pat/combustion", :ref=>"50a946b5a7ab3d9249f0e5fcebbb73488a91b1e5" +gem "rails", "4.1" +gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby, :github=>"jruby/activerecord-jdbc-adapter" + +gemspec :path=>".././" diff --git a/gemfiles/Rails_4.2.gemfile b/gemfiles/Rails_4.2.gemfile new file mode 100644 index 0000000..9ca6b94 --- /dev/null +++ b/gemfiles/Rails_4.2.gemfile @@ -0,0 +1,19 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rake" +gem "colored" +gem "pry" +gem "rspec" +gem "simplecov", :require=>false +gem "simplecov-summary" +gem "appraisal", :github=>"thoughtbot/appraisal" +gem "sqlite3", :platform=>:ruby +gem "jdbc-sqlite3", :platform=>:jruby, :require=>"jdbc/sqlite3" +gem "ruby-prof", :platform=>:ruby +gem "combustion", :github=>"pat/combustion", :ref=>"50a946b5a7ab3d9249f0e5fcebbb73488a91b1e5" +gem "rails", "4.2" +gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby, :github=>"jruby/activerecord-jdbc-adapter" + +gemspec :path=>".././"