diff --git a/Gemfile b/Gemfile index a1e60bb5..d30b531a 100644 --- a/Gemfile +++ b/Gemfile @@ -12,17 +12,17 @@ end # do we want 6.1 or 7.0 # see if rails 6 fixes this -gem 'rails', '6.1' +gem 'rails', '7.0.2' gem 'jquery-rails' gem 'sass-rails' gem 'uglifier' # changed blacklight version -# gem 'blacklight', '7.24.0' +gem 'blacklight', '7.24.0' # temp for rails 6 -gem 'blacklight', '7.14.0' -gem 'blacklight_range_limit' +# gem 'blacklight', '7.14.0' +gem 'blacklight_range_limit', '7.3.0' # removed pinned verision of '~> 0.4.10' gem 'mysql2' diff --git a/Gemfile.lock b/Gemfile.lock index cd6dd51d..f9c531f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,40 +1,47 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.1.0) - actionpack (= 6.1.0) - activesupport (= 6.1.0) + actioncable (7.0.2) + actionpack (= 7.0.2) + activesupport (= 7.0.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.0) - actionpack (= 6.1.0) - activejob (= 6.1.0) - activerecord (= 6.1.0) - activestorage (= 6.1.0) - activesupport (= 6.1.0) + actionmailbox (7.0.2) + actionpack (= 7.0.2) + activejob (= 7.0.2) + activerecord (= 7.0.2) + activestorage (= 7.0.2) + activesupport (= 7.0.2) mail (>= 2.7.1) - actionmailer (6.1.0) - actionpack (= 6.1.0) - actionview (= 6.1.0) - activejob (= 6.1.0) - activesupport (= 6.1.0) + net-imap + net-pop + net-smtp + actionmailer (7.0.2) + actionpack (= 7.0.2) + actionview (= 7.0.2) + activejob (= 7.0.2) + activesupport (= 7.0.2) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.0) - actionview (= 6.1.0) - activesupport (= 6.1.0) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.2) + actionview (= 7.0.2) + activesupport (= 7.0.2) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.0) - actionpack (= 6.1.0) - activerecord (= 6.1.0) - activestorage (= 6.1.0) - activesupport (= 6.1.0) + actiontext (7.0.2) + actionpack (= 7.0.2) + activerecord (= 7.0.2) + activestorage (= 7.0.2) + activesupport (= 7.0.2) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.0) - activesupport (= 6.1.0) + actionview (7.0.2) + activesupport (= 7.0.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -57,29 +64,28 @@ GEM active_fedora-noid (0.1.0) active-fedora noid - activejob (6.1.0) - activesupport (= 6.1.0) + activejob (7.0.2) + activesupport (= 7.0.2) globalid (>= 0.3.6) - activemodel (6.1.0) - activesupport (= 6.1.0) - activerecord (6.1.0) - activemodel (= 6.1.0) - activesupport (= 6.1.0) + activemodel (7.0.2) + activesupport (= 7.0.2) + activerecord (7.0.2) + activemodel (= 7.0.2) + activesupport (= 7.0.2) activerecord-import (1.5.0) activerecord (>= 4.2) - activestorage (6.1.0) - actionpack (= 6.1.0) - activejob (= 6.1.0) - activerecord (= 6.1.0) - activesupport (= 6.1.0) - marcel (~> 0.3.1) - mimemagic (~> 0.3.2) - activesupport (6.1.0) + activestorage (7.0.2) + actionpack (= 7.0.2) + activejob (= 7.0.2) + activerecord (= 7.0.2) + activesupport (= 7.0.2) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (7.0.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) @@ -92,17 +98,17 @@ GEM rubocop-performance rubocop-rails rubocop-rspec - blacklight (7.14.0) + blacklight (7.24.0) deprecation globalid i18n (>= 1.7.0) jbuilder (~> 2.7) kaminari (>= 0.15) ostruct (>= 0.3.2) - rails (>= 5.1, < 7) - view_component (>= 2.23.0) - blacklight_range_limit (8.1.0) - blacklight (~> 7.0) + rails (>= 5.1, < 7.1) + view_component (~> 2.43) + blacklight_range_limit (7.3.0) + blacklight (>= 7.0) bootstrap (4.6.2) autoprefixer-rails (>= 9.1.0) popper_js (>= 1.16.1, < 2) @@ -274,13 +280,9 @@ GEM net-imap net-pop net-smtp - marcel (0.3.3) - mimemagic (~> 0.3.2) + marcel (1.0.2) matrix (0.4.2) method_source (1.0.0) - mimemagic (0.3.10) - nokogiri (~> 1) - rake mini_mime (1.1.5) minitar (0.9) minitest (5.20.0) @@ -342,21 +344,20 @@ GEM rdf (~> 3.3) rack-test (2.1.0) rack (>= 1.3) - rails (6.1.0) - actioncable (= 6.1.0) - actionmailbox (= 6.1.0) - actionmailer (= 6.1.0) - actionpack (= 6.1.0) - actiontext (= 6.1.0) - actionview (= 6.1.0) - activejob (= 6.1.0) - activemodel (= 6.1.0) - activerecord (= 6.1.0) - activestorage (= 6.1.0) - activesupport (= 6.1.0) + rails (7.0.2) + actioncable (= 7.0.2) + actionmailbox (= 7.0.2) + actionmailer (= 7.0.2) + actionpack (= 7.0.2) + actiontext (= 7.0.2) + actionview (= 7.0.2) + activejob (= 7.0.2) + activemodel (= 7.0.2) + activerecord (= 7.0.2) + activestorage (= 7.0.2) + activesupport (= 7.0.2) bundler (>= 1.15.0) - railties (= 6.1.0) - sprockets-rails (>= 2.0.0) + railties (= 7.0.2) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -364,12 +365,13 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (6.1.0) - actionpack (= 6.1.0) - activesupport (= 6.1.0) + railties (7.0.2) + actionpack (= 7.0.2) + activesupport (= 7.0.2) method_source - rake (>= 0.8.7) + rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.1.0) rdf (3.3.1) @@ -585,7 +587,7 @@ GEM unf_ext (0.0.8.2) unicode-display_width (2.5.0) unicode-types (1.9.0) - view_component (3.6.0) + view_component (2.82.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -607,8 +609,8 @@ DEPENDENCIES active-fedora (= 14.0.0) active_fedora-noid bixby - blacklight (= 7.14.0) - blacklight_range_limit + blacklight (= 7.24.0) + blacklight_range_limit (= 7.3.0) bootstrap (~> 4.0) byebug http @@ -618,7 +620,7 @@ DEPENDENCIES passenger puma qa - rails (= 6.1) + rails (= 7.0.2) riiif rsolr (>= 1.0, < 3) rspec-its