Update test matrix

.travis.yml

@@ -6,9 +6,10 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1
-  - jruby-19mode
-  - jruby-21mode
-  - rbx-2
+  - 2.2
+  - 2.3
+  - jruby
+  - rbx
 env:
   - DB=sqlite
   - DB=mysql
@@ -17,8 +18,5 @@ language: ruby
 matrix:
   fast_finish: true
   allow_failures:
-    - rvm: rbx-2
-    - rvm: jruby-21mode
-notifications:
-  recipients:
-    - swrobel@gmail.com
+    - rvm: rbx
+    - rvm: jruby

Gemfile

@@ -1,18 +1,17 @@
 source 'https://rubygems.org'
 
-# Need to use this patch until my fix for jruby/mysql is accepted
-gem 'spree_core', github: 'swrobel/spree', branch: 'patch-2'
-
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-  gem 'activerecord-jdbcmysql-adapter'
+  # The following 2 are only for TravisCI
+  gem 'activerecord-jdbcpostgresql-adapter' if ENV['DB'] == 'postgres'
+  gem 'activerecord-jdbcmysql-adapter' if ENV['DB'] == 'mysql'
 end
 
 platforms :ruby do
   gem 'sqlite3'
-  gem 'pg'
-  gem 'mysql2'
+  # The following 2 are only for TravisCI
+  gem 'pg' if ENV['DB'] == 'postgres'
+  gem 'mysql2' if ENV['DB'] == 'mysql'
 end
 
 gemspec

README.md

@@ -49,8 +49,9 @@ This extension is tested against the following rubies:
 * 1.9.3
 * 2.0
 * 2.1
-* jruby-19mode
-* jruby-21mode (experimental)
+* 2.2
+* 2.3
+* jruby (experimental)
 * rubinius (experimental)
 
 As well as the following databases:
@@ -66,7 +67,7 @@ Be sure to bundle your dependencies and then create a dummy test app for the spe
 ```shell
 bundle
 bundle exec rake test_app
-bundle exec rspec spec
+bundle exec rspec
 ```
 
 License

spree_zero_stock_products.gemspec

@@ -8,16 +8,14 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.3'
 
   s.author    = 'Stefan Wrobel'
-  s.email     = 'swrobel@gmail.com'
   s.homepage  = 'https://github.com/swrobel/spree_zero_stock_products'
   s.license   = 'MIT'
 
   s.files       = `git ls-files`.split("\n")
-  s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '~> 2.4.0.rc'
+  s.add_dependency 'spree_core', '~> 2.4.0'
   s.add_dependency 'durable_decorator', '~> 0.2.0'
 
   s.add_development_dependency 'database_cleaner'