Gemfile in solidus_volume_pricing-1.0.0 vs Gemfile in solidus_volume_pricing-1.1.0

- old
+ new

@@ -1,27 +1,36 @@ # frozen_string_literal: true source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } branch = ENV.fetch('SOLIDUS_BRANCH', 'master') -gem 'solidus', git: 'https://github.com/solidusio/solidus.git', branch: branch +solidus_git, solidus_frontend_git = if (branch == 'master') || (branch >= 'v3.2') + %w[solidusio/solidus solidusio/solidus_frontend] + else + %w[solidusio/solidus] * 2 + end +gem 'solidus', github: solidus_git, branch: branch +gem 'solidus_frontend', github: solidus_frontend_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 +# otherwise it takes forever to resolve them. +# See https://github.com/bundler/bundler/issues/6677 +gem 'rails', '>0.a' +# Provides basic authentication functionality for testing parts of your engine +gem 'solidus_auth_devise' + case ENV['DB'] -when 'postgresql' - gem 'pg' when 'mysql' gem 'mysql2' +when 'postgresql' + gem 'pg' else gem 'sqlite3' end -gem 'solidus_extension_dev_tools', github: 'solidusio-contrib/solidus_extension_dev_tools' - gemspec + +# Use a local Gemfile to include development dependencies that might not be +# relevant for the project or for other contributors, e.g.: `gem 'pry-debug'`. +send :eval_gemfile, 'Gemfile-local' if File.exist? 'Gemfile-local'