Gemfile in solidus_volume_pricing-0.2.1 vs Gemfile in solidus_volume_pricing-1.0.0

- old
+ new

@@ -1,13 +1,27 @@ +# frozen_string_literal: true + source 'https://rubygems.org' -branch = ENV.fetch('SOLIDUS_BRANCH', 'v1.3') -gem "solidus", github: "solidusio/solidus", branch: branch +branch = ENV.fetch('SOLIDUS_BRANCH', 'master') +gem 'solidus', git: 'https://github.com/solidusio/solidus.git', branch: branch +# 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.2' +end + case ENV['DB'] -when 'mysql' - gem 'mysql2' when 'postgresql' gem 'pg' +when 'mysql' + gem 'mysql2' +else + gem 'sqlite3' end + +gem 'solidus_extension_dev_tools', github: 'solidusio-contrib/solidus_extension_dev_tools' gemspec