Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Update `spree_admin` dependencies (#12140)

Damian Legawiecf6f63d5259eb
diff --git a/admin/Gemfile b/admin/Gemfile
index 4c65a60309..95dc8177c1 100644
--- a/admin/Gemfile
+++ b/admin/Gemfile
@@ -1,6 +1,5 @@
eval_gemfile('../common_spree_dependencies.rb')
gem 'spree_core', path: '../core'
-gem 'bootstrap', github: 'twbs/bootstrap-rubygem', branch: '4.6-stable'
gemspec
diff --git a/admin/lib/spree/admin.rb b/admin/lib/spree/admin.rb
index 517e6c681f..d727a026ca 100644
--- a/admin/lib/spree/admin.rb
+++ b/admin/lib/spree/admin.rb
@@ -3,6 +3,9 @@ require 'spree_core'
require 'sprockets/railtie'
require 'active_link_to'
+require 'countries/global'
+require 'country_select'
+require 'currency_select'
require 'dartsass-rails'
require 'importmap-rails'
require 'bootstrap'
diff --git a/admin/spree_admin.gemspec b/admin/spree_admin.gemspec
index ee79507878..f34f020dd1 100644
--- a/admin/spree_admin.gemspec
+++ b/admin/spree_admin.gemspec
@@ -29,7 +29,10 @@ Gem::Specification.new do |s|
s.add_dependency 'spree_core', ">= #{s.version}"
s.add_dependency 'active_link_to'
- s.add_dependency 'bootstrap', '~> 4.6'
+ s.add_dependency 'bootstrap', '~> 4.6', '>= 4.6.2.1'
+ s.add_dependency 'countries'
+ s.add_dependency 'country_select', '~> 6.0'
+ s.add_dependency 'currency_select'
s.add_dependency 'dartsass-rails', '~> 0.5'
s.add_dependency 'importmap-rails'
s.add_dependency 'inline_svg', '~> 1.5'