Allow Solidus 2

The Gemfile update is because this gem isn't being maintained.
Lostmyname · Feb 23, 2017 · f7523e1 · f7523e1
1 parent 1ee4e81
commit f7523e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,8 +1,5 @@
 source 'https://rubygems.org'
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem "solidus", github: "solidusio/solidus", branch: branch
-
 gem 'sqlite3'
 gem 'mysql2'
 gem 'pg'

diff --git a/spree_paypal_express.gemspec b/spree_paypal_express.gemspec
@@ -22,12 +22,12 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency "solidus_core", "~> 1.0"
+  s.add_dependency "solidus_core", ">= 1.0", "< 2.1"
   s.add_dependency 'paypal-sdk-merchant', '1.117.2'
 
-  s.add_development_dependency "solidus", "~> 1.0"
-  s.add_development_dependency "solidus_auth_devise", "~> 1.2"
-  s.add_development_dependency "solidus_sample", "~> 1.0"
+  s.add_development_dependency "solidus"
+  s.add_development_dependency "solidus_auth_devise"
+  s.add_development_dependency "solidus_sample"
 
   s.add_development_dependency 'coffee-rails'
   s.add_development_dependency 'show_me_the_cookies', '~> 3.0.0'
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'factory_girl', '~> 4.2'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'rspec-activemodel-mocks'
-  s.add_development_dependency 'rspec-rails', "~> 3.3"
+  s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'simplecov'