Merge pull request #170 from aldesantis/bugfix/rails-6-build

Relax sqlite3 dependency for Rails 6 support

Author: kennyadsl

Gemfile

@@ -5,19 +5,23 @@ source "https://rubygems.org"
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
 gem "solidus", github: "solidusio/solidus", branch: branch
 
-group :test do
-  if branch == 'master' || branch >= "v2.0"
-    gem 'rails-controller-testing', '~> 1.0'
-  else
-    gem "rails_test_params_backport"
-  end
+# Needed to help Bundler figure out how to resolve dependencies,
+# otherwise it takes forever to resolve them
+if branch == 'master' || Gem::Version.new(branch[1..-1]) >= Gem::Version.new('2.10.0')
+  gem 'rails', '~> 6.0'
+else
+  gem 'rails', '~> 5.0'
+end
 
-  gem 'factory_bot', (branch < 'v2.5' ? '4.10.0' : '> 4.10.0')
+group :test do
+  gem 'rails-controller-testing', '~> 1.0'
+  gem 'factory_bot', '> 4.10.0'
 end
 
-if ENV['DB'] == 'mysql'
+case ENV['DB']
+when 'mysql'
   gem 'mysql2', '~> 0.4.10'
-else
+when 'postgres'
   gem 'pg', '~> 0.21'
 end
 

solidus_auth_devise.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "ffaker"
   s.add_development_dependency "gem-release", "~> 2.0"
   s.add_development_dependency "github_changelog_generator", "~> 1.14"
-  s.add_development_dependency "rspec-rails", "~> 3.3"
+  s.add_development_dependency "rspec-rails", "~> 4.0.0.beta2"
   s.add_development_dependency "rubocop", "~> 0.71"
   s.add_development_dependency "rubocop-performance", "~> 1.4"
   s.add_development_dependency "rubocop-rails", "~> 2.2"
@@ -52,5 +52,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "simplecov", "~> 0.14"
   s.add_development_dependency "solidus_backend", solidus_version
   s.add_development_dependency "solidus_frontend", solidus_version
-  s.add_development_dependency "sqlite3", "~> 1.3.6"
+  s.add_development_dependency "sqlite3"
 end