Merge pull request #12 from jhawthorn/solidus-2-0

Add support for Solidus 2.0 and Rails 5

.travis.yml

@@ -2,11 +2,20 @@ sudo: false
 cache: bundler
 language: ruby
 rvm:
-  - 2.3.0
+  - 2.3.1
 env:
   matrix:
-    - SOLIDUS_BRANCH=v1.0
-    - SOLIDUS_BRANCH=v1.1
-    - SOLIDUS_BRANCH=v1.2
-    - SOLIDUS_BRANCH=v1.3
-    - SOLIDUS_BRANCH=master
+    - SOLIDUS_BRANCH=v1.0 DB=postgres
+    - SOLIDUS_BRANCH=v1.1 DB=postgres
+    - SOLIDUS_BRANCH=v1.2 DB=postgres
+    - SOLIDUS_BRANCH=v1.3 DB=postgres
+    - SOLIDUS_BRANCH=v1.4 DB=postgres
+    - SOLIDUS_BRANCH=v2.0 DB=postgres
+    - SOLIDUS_BRANCH=master DB=postgres
+    - SOLIDUS_BRANCH=v1.0 DB=mysql
+    - SOLIDUS_BRANCH=v1.1 DB=mysql
+    - SOLIDUS_BRANCH=v1.2 DB=mysql
+    - SOLIDUS_BRANCH=v1.3 DB=mysql
+    - SOLIDUS_BRANCH=v1.4 DB=mysql
+    - SOLIDUS_BRANCH=v2.0 DB=mysql
+    - SOLIDUS_BRANCH=master DB=mysql

Gemfile

@@ -1,11 +1,18 @@
-source 'http://rubygems.org'
+source "https://rubygems.org"
 
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem 'solidus', github: 'solidusio/solidus', branch: branch
+gem "solidus", github: "solidusio/solidus", branch: branch
+gem 'solidus_auth_devise'
+
+if branch == 'master' || branch >= "v2.0"
+  gem "rails-controller-testing", group: :test
+end
+
+gem 'pg'
+gem 'mysql2'
 
-# Provides basic authentication functionality for testing parts of your engine
 group :development, :test do
-  gem 'solidus_auth_devise'
+  gem "pry-rails"
 end
 
 gemspec

solidus_product_feed.gemspec

@@ -20,8 +20,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_runtime_dependency 'solidus_core', ["~> 1.0"]
-  s.add_runtime_dependency 'solidus_backend', ["~> 1.0"]
+  s.add_runtime_dependency 'solidus_backend', [">= 1.0", "< 3"]
 
   s.add_development_dependency 'rspec-rails', '~> 3.4'
   s.add_development_dependency 'rubocop', '~> 0.39.0'