Skip to content

Commit

Permalink
Relax dependencies to allow for more flexbility with Gemfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
damianlegawiec committed May 19, 2021
1 parent a7096f6 commit 853bc79
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 21 deletions.
2 changes: 1 addition & 1 deletion api/spree_api.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'jsonapi-rspec'

s.add_dependency 'spree_core', s.version
s.add_dependency 'rabl', '~> 0.14.2'
s.add_dependency 'rabl', '~> 0.14', '>= 0.14.2'
s.add_dependency 'jsonapi-serializer', '~> 2.1'
s.add_dependency 'doorkeeper', '~> 5.2', '>= 5.2.1'
end
10 changes: 5 additions & 5 deletions backend/spree_backend.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ Gem::Specification.new do |s|
s.add_dependency 'spree_api', s.version
s.add_dependency 'spree_core', s.version

s.add_dependency 'bootstrap', '>= 4.3.1', '< 4.7.0'
s.add_dependency 'glyphicons', '~> 1.0.2'
s.add_dependency 'flatpickr', '~> 4.6.0'
s.add_dependency 'bootstrap', '~> 4.0'
s.add_dependency 'glyphicons', '~> 1.0'
s.add_dependency 'flatpickr', '~> 4.6'
s.add_dependency 'inline_svg', '~> 1.5'
s.add_dependency 'jquery-rails', '~> 4.3'
s.add_dependency 'jquery-ui-rails', '~> 6.0.1'
s.add_dependency 'select2-rails', '~> 4.0.0'
s.add_dependency 'jquery-ui-rails', '~> 6.0'
s.add_dependency 'select2-rails', '~> 4.0'
end
1 change: 1 addition & 0 deletions common_spree_dependencies.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
gem 'pry-byebug'
gem 'webdrivers', '~> 4.1'
gem 'puma'
gem 'ffaker'
end

gem 'solargraph', group: :development
21 changes: 10 additions & 11 deletions core/spree_core.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,29 +27,28 @@ Gem::Specification.new do |s|
s.require_path = 'lib'

s.add_dependency 'activemerchant', '~> 1.67'
s.add_dependency 'acts_as_list', '~> 0.8'
s.add_dependency 'awesome_nested_set', '>= 3.3.1', '< 4.0'
s.add_dependency 'carmen', '>= 1.0', '< 1.2'
s.add_dependency 'acts_as_list', '>= 0.8'
s.add_dependency 'awesome_nested_set', '~> 3.3', '>= 3.3.1'
s.add_dependency 'carmen', '>= 1.0'
s.add_dependency 'cancancan', '~> 3.2'
s.add_dependency 'ffaker', '~> 2.9'
s.add_dependency 'friendly_id', '>= 5.2.1', '< 5.5.0'
s.add_dependency 'highline', '~> 2.0.0' # Necessary for the install generator
s.add_dependency 'kaminari', '~> 1.2.1'
s.add_dependency 'friendly_id', '~> 5.2', '>= 5.2.1'
s.add_dependency 'highline', '~> 2.0' # Necessary for the install generator
s.add_dependency 'kaminari', '~> 1.2'
s.add_dependency 'money', '~> 6.13'
s.add_dependency 'monetize', '~> 1.9'
s.add_dependency 'paranoia', '~> 2.4.2'
s.add_dependency 'paranoia', '~> 2.4'
s.add_dependency 'premailer-rails'
s.add_dependency 'rails', '>= 6.0', '< 6.2'
s.add_dependency 'ransack', '>= 2.3', '< 2.5'
s.add_dependency 'ransack', '~> 2.3'
s.add_dependency 'responders'
s.add_dependency 'rexml'
s.add_dependency 'state_machines-activerecord', '~> 0.6'
s.add_dependency 'state_machines-activemodel', '~> 0.7'
s.add_dependency 'stringex'
s.add_dependency 'twitter_cldr', '>= 4.3', '< 7.0'
s.add_dependency 'twitter_cldr', '>= 4.3'
s.add_dependency 'sprockets', '~> 3.7'
s.add_dependency 'sprockets-rails'
s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.12.0'
s.add_dependency 'mini_magick', '~> 4.9', '>= 4.9.4'
s.add_dependency 'image_processing', '~> 1.2'
s.add_dependency 'active_storage_validations', '~> 0.9'

Expand Down
8 changes: 4 additions & 4 deletions frontend/spree_frontend.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ Gem::Specification.new do |s|
s.add_dependency 'spree_api', s.version
s.add_dependency 'spree_core', s.version

s.add_dependency 'bootstrap', '>= 4.3.1', '< 4.7.0'
s.add_dependency 'glyphicons', '~> 1.0.2'
s.add_dependency 'canonical-rails', '~> 0.2.10'
s.add_dependency 'bootstrap', '~> 4.0'
s.add_dependency 'glyphicons', '~> 1.0'
s.add_dependency 'canonical-rails', '~> 0.2', '>= 0.2.10'
s.add_dependency 'inline_svg', '~> 1.5'
s.add_dependency 'jquery-rails', '~> 4.3'
s.add_dependency 'turbolinks', '~> 5.2.0'
s.add_dependency 'turbolinks', '~> 5.2'

s.add_development_dependency 'capybara-accessible'
end
1 change: 1 addition & 0 deletions sample/spree_sample.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ Gem::Specification.new do |s|
s.requirements << 'none'

s.add_dependency 'spree_core', s.version
s.add_dependency 'ffaker', '~> 2.9'
end

0 comments on commit 853bc79

Please sign in to comment.