diff --git a/Gemfile b/Gemfile index 5d854d9..642410e 100644 --- a/Gemfile +++ b/Gemfile @@ -31,7 +31,7 @@ gem 'aws-sdk' , '~> 3' gem 'aws-sdk-s3', require: false gem 'spree', '~> 3.7.0' -gem 'spree_auth_devise', '~> 3.5' +gem 'spree_auth_devise', '~> 4.0' gem 'spree_gateway', '~> 3.4' gem 'tel_to_helper' diff --git a/Gemfile.lock b/Gemfile.lock index ffdebd5..31eeb26 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,7 +27,7 @@ GEM activejob (5.2.6) activesupport (= 5.2.6) globalid (>= 0.3.6) - activemerchant (1.124.0) + activemerchant (1.126.0) activesupport (>= 4.2) builder (>= 2.1.2, < 4.0.0) i18n (>= 0.6.9) @@ -51,8 +51,8 @@ GEM activerecord (~> 5.0) acts_as_list (0.9.19) activerecord (>= 3.0) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) arel (9.0.0) autoprefixer-rails (10.3.3.0) execjs (~> 2) @@ -1216,7 +1216,7 @@ GEM aws-sigv2 (1.1.0) aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) - bcrypt (3.1.16) + bcrypt (3.1.18) better_errors (2.9.1) coderay (>= 1.0.0) erubi (>= 1.0.0) @@ -1247,31 +1247,33 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.9) + concurrent-ruby (1.2.0) crass (1.0.6) - css_parser (1.10.0) + css_parser (1.12.0) addressable debug_inspector (1.1.0) - deface (1.8.1) + deface (1.9.0) + actionview (>= 5.2) nokogiri (>= 1.6) polyglot - rails (>= 5.2) + railties (>= 5.2) rainbow (>= 2.1.0) - devise (4.6.2) + devise (4.8.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0) responders warden (~> 1.2.3) devise-encryptable (0.2.0) devise (>= 2.1.0) + digest (3.1.1) doorkeeper (5.5.4) railties (>= 5) - erubi (1.10.0) + erubi (1.12.0) execjs (2.8.1) fast_jsonapi (1.5) activesupport (>= 4.2) - ffaker (2.20.0) + ffaker (2.21.0) ffi (1.15.4) figaro (1.2.0) thor (>= 0.14.0, < 2) @@ -1284,15 +1286,16 @@ GEM railties (>= 4.2) friendly_id (5.2.5) activerecord (>= 4.0.0) - globalid (0.5.2) + globalid (1.1.0) activesupport (>= 5.0) high_voltage (3.1.2) highline (2.0.3) htmlentities (4.3.4) - i18n (1.8.11) + i18n (1.12.0) concurrent-ruby (~> 1.0) invisible_captcha (2.0.0) rails (>= 5.0) + io-wait (0.3.0) jbuilder (2.11.2) activesupport (>= 5.0.0) jmespath (1.4.0) @@ -1319,27 +1322,43 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.12.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.1) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) method_source (1.0.0) - mime-types (3.3.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0901) + mime-types-data (3.2022.0105) mimemagic (0.3.10) nokogiri (~> 1) rake mini_magick (4.9.5) mini_mime (1.1.2) - minitest (5.14.4) - monetize (1.11.0) + minitest (5.15.0) + monetize (1.12.0) money (~> 6.12) money (6.16.0) i18n (>= 0.6.4, <= 2) msgpack (1.4.2) + net-imap (0.2.2) + digest + net-protocol + strscan + net-pop (0.1.2) + net-protocol + net-protocol (0.1.1) + io-wait + timeout + net-smtp (0.3.0) + digest + net-protocol + timeout nio4r (2.5.8) nokogiri (1.12.5-x86_64-darwin) racc (~> 1.4) @@ -1360,17 +1379,18 @@ GEM addressable css_parser (>= 1.6.0) htmlentities (>= 4.0.0) - premailer-rails (1.11.1) + premailer-rails (1.12.0) actionmailer (>= 3) + net-smtp premailer (~> 1.7, >= 1.7.9) - public_suffix (4.0.6) + public_suffix (4.0.7) puma (3.12.6) rabl (0.13.1) activesupport (>= 2.3.14) - racc (1.6.0) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) + racc (1.6.2) + rack (2.2.6.2) + rack-test (2.0.2) + rack (>= 1.3) rails (5.2.6) actioncable (= 5.2.6) actionmailer (= 5.2.6) @@ -1387,15 +1407,15 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) - loofah (~> 2.3) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) railties (5.2.6) actionpack (= 5.2.6) activesupport (= 5.2.6) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) ransack (2.1.1) actionpack (>= 5.0) @@ -1405,9 +1425,9 @@ GEM rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) + responders (3.1.0) + actionpack (>= 5.2) + railties (>= 5.2) ruby_dep (1.5.0) sass (3.7.4) sass-listen (~> 4.0.0) @@ -1440,10 +1460,11 @@ GEM rabl (~> 0.13.1) spree_core (= 3.7.14.1) versioncake (~> 3.4.0) - spree_auth_devise (3.5.2) - devise (>= 4.4, < 4.7) + spree_auth_devise (4.0.1) + deface (~> 1.0) + devise (~> 4.7) devise-encryptable (= 0.2.0) - spree_core (>= 3.1.0, < 4.0) + spree_core (>= 3.1.0, < 4.1) spree_extension spree_backend (3.7.14.1) bootstrap-sass (~> 3.4) @@ -1480,7 +1501,7 @@ GEM state_machines-activerecord (~> 0.5) stringex twitter_cldr (~> 4.3) - spree_extension (0.0.9) + spree_extension (0.1.0) activerecord (>= 4.2) spree_core spree_frontend (3.7.14.1) @@ -1501,9 +1522,9 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) state_machines (0.5.0) state_machines-activemodel (0.8.0) @@ -1513,6 +1534,7 @@ GEM activerecord (>= 5.1) state_machines-activemodel (>= 0.8.0) stringex (2.8.5) + strscan (3.0.6) tel_to_helper (0.1.0) rails terrapin (0.6.0) @@ -1520,13 +1542,14 @@ GEM thor (0.20.3) thread_safe (0.3.6) tilt (2.0.10) + timeout (0.3.1) tinymce-rails (5.10.1) railties (>= 3.1.1) twitter_cldr (4.4.5) camertron-eprun cldr-plurals-runtime-rb (~> 1.0) tzinfo - tzinfo (1.2.9) + tzinfo (1.2.11) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -1579,7 +1602,7 @@ DEPENDENCIES sass-rails (~> 5.0) simple_form spree (~> 3.7.0) - spree_auth_devise (~> 3.5) + spree_auth_devise (~> 4.0) spree_gateway (~> 3.4) spring spring-watcher-listen (~> 2.0.0)