diff --git a/Gemfile b/Gemfile index f0359b959..994e957d1 100644 --- a/Gemfile +++ b/Gemfile @@ -129,3 +129,9 @@ gem 'secure_headers' gem 'sidekiq' gem 'terser' # to support the Safe Navigation / Optional Chaining operator (?.) and avoid uglifier precompile issue gem 'tether-rails' + +# When first attempting to upgrade to Hyrax v3.4.2, this dry-monads gem was upgraded to v1.5.0. +# This version threw the following error: +# NameError: uninitialized constant Dry::Monads::Result::Transformer +# Locking it to v1.4.x does not throw an error. +gem 'dry-monads', '~> 1.4.0' diff --git a/Gemfile.lock b/Gemfile.lock index 979d5c5f7..f672b7aeb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,7 +74,7 @@ GEM activemodel (= 5.2.8) activesupport (= 5.2.8) arel (>= 9.0) - activerecord-import (1.4.0) + activerecord-import (1.4.1) activerecord (>= 4.2) activerecord-nulldb-adapter (0.8.0) activerecord (>= 5.2.0, < 7.1) @@ -189,14 +189,13 @@ GEM autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) breadcrumbs_on_rails (3.0.1) - browse-everything (1.1.2) + browse-everything (1.2.0) addressable (~> 2.5) aws-sdk-s3 - dropbox_api (>= 0.1.10) - google-api-client (~> 0.23) - google_drive (>= 2.1, < 4) - googleauth (>= 0.6.6, < 1.0) - rails (>= 4.2, < 7.0) + dropbox_api (>= 0.1.20) + google-apis-drive_v3 + googleauth (>= 0.6.6, < 2.0) + rails (>= 4.2, < 7.1) ruby-box signet (~> 0.8) typhoeus @@ -310,12 +309,11 @@ GEM dropbox_api (0.1.21) faraday (< 3.0) oauth2 (~> 1.1) - dry-configurable (0.15.0) - concurrent-ruby (~> 1.0) + dry-configurable (0.16.1) dry-core (~> 0.6) - dry-container (0.9.0) + zeitwerk (~> 2.6) + dry-container (0.11.0) concurrent-ruby (~> 1.0) - dry-configurable (~> 0.13, >= 0.13.0) dry-core (0.7.1) concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) @@ -323,7 +321,7 @@ GEM concurrent-ruby (~> 1.0) dry-core (~> 0.4) dry-equalizer (~> 0.2) - dry-inflector (0.2.1) + dry-inflector (0.3.0) dry-initializer (3.1.1) dry-logic (1.2.0) concurrent-ruby (~> 1.0) @@ -333,12 +331,12 @@ GEM dry-monads (1.4.0) concurrent-ruby (~> 1.0) dry-core (~> 0.7) - dry-schema (1.9.2) + dry-schema (1.10.6) concurrent-ruby (~> 1.0) dry-configurable (~> 0.13, >= 0.13.0) dry-core (~> 0.5, >= 0.5) dry-initializer (~> 3.0) - dry-logic (~> 1.0) + dry-logic (~> 1.2) dry-types (~> 1.5) dry-struct (1.4.0) dry-core (~> 0.5, >= 0.5) @@ -376,7 +374,7 @@ GEM equivalent-xml (0.6.0) nokogiri (>= 1.4.3) erubi (1.10.0) - ethon (0.15.0) + ethon (0.16.0) ffi (>= 1.15.0) excon (0.71.1) execjs (2.8.1) @@ -401,16 +399,12 @@ GEM flutie (2.2.0) font-awesome-rails (4.7.0.8) railties (>= 3.2, < 8.0) - gems (1.2.0) gender_detector (0.1.2) unicode_utils (>= 1.3.0) - geocoder (1.8.0) + geocoder (1.8.1) globalid (1.0.0) activesupport (>= 5.0) - google-api-client (0.53.0) - google-apis-core (~> 0.1) - google-apis-generator (~> 0.1) - google-apis-core (0.5.0) + google-apis-core (0.9.1) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -419,36 +413,22 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-discovery_v1 (0.9.0) - google-apis-core (>= 0.5, < 2.a) - google-apis-drive_v3 (0.23.0) - google-apis-core (>= 0.5, < 2.a) - google-apis-generator (0.6.0) - activesupport (>= 5.0) - gems (~> 1.2) - google-apis-core (>= 0.5, < 2.a) - google-apis-discovery_v1 (~> 0.5) - thor (>= 0.20, < 2.a) - google-apis-sheets_v4 (0.14.0) - google-apis-core (>= 0.5, < 2.a) - google_drive (3.0.7) - google-apis-drive_v3 (>= 0.5.0, < 1.0.0) - google-apis-sheets_v4 (>= 0.4.0, < 1.0.0) - googleauth (>= 0.5.0, < 1.0.0) - nokogiri (>= 1.5.3, < 2.0.0) - googleauth (0.17.1) - faraday (>= 0.17.3, < 2.0) + google-apis-drive_v3 (0.32.0) + google-apis-core (>= 0.9.1, < 2.a) + googleauth (1.3.0) + faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.15) + signet (>= 0.16, < 2.a) haml (5.2.2) temple (>= 0.8.0) tilt hamster (3.0.0) concurrent-ruby (~> 1.0) hashdiff (1.0.1) + hashie (5.0.0) highline (2.0.3) hiredis (0.6.3) htmlentities (4.3.4) @@ -464,10 +444,9 @@ GEM hydra-core (11.0.7) hydra-access-controls (= 11.0.7) railties (>= 4.0.0, < 6) - hydra-derivatives (3.6.1) + hydra-derivatives (3.7.0) active-fedora (>= 11.5.6, != 13.2.1, != 13.2.0, != 13.1.3, != 13.1.2, != 13.1.1, != 13.1.0, != 13.0.0, != 12.2.1, != 12.2.0, != 12.1.1, != 12.1.0, != 12.0.3, != 12.0.2, != 12.0.1, != 12.0.0) active_encode (~> 0.1) - activemodel (< 6.1) activesupport (>= 4.0, < 7) addressable (~> 2.5) deprecation @@ -496,7 +475,7 @@ GEM hydra-derivatives (~> 3.6) hydra-file_characterization (~> 1.0) hydra-pcdm (>= 0.9) - hyrax (3.4.1) + hyrax (3.4.2) active-fedora (~> 13.1, >= 13.1.2) almond-rails (~> 0.1) awesome_nested_set (~> 3.1) @@ -523,6 +502,7 @@ GEM iiif_manifest (>= 0.3, < 2.0) jquery-datatables-rails (~> 3.4) jquery-ui-rails (~> 6.0) + json-ld (< 3.2) json-schema kaminari_route_prefix (~> 0.1.1) legato (~> 0.3) @@ -534,6 +514,7 @@ GEM oauth2 (~> 1.2) posix-spawn power_converter (~> 0.1, >= 0.1.2) + psych (~> 3.3) qa (~> 5.5, >= 5.5.1) rails (~> 5.0) rails_autolink (~> 1.1) @@ -548,7 +529,7 @@ GEM sass-rails (~> 5.0) select2-rails (~> 3.5) signet - tinymce-rails + tinymce-rails (~> 5.10) valkyrie (~> 2, >= 2.1.1) i18n (1.10.0) concurrent-ruby (~> 1.0) @@ -565,7 +546,7 @@ GEM rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) ice_nine (0.11.2) - iiif_manifest (1.1.1) + iiif_manifest (1.2.0) activesupport (>= 4) is_it_working (1.1.0) iso-639 (0.3.5) @@ -585,7 +566,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (2.6.2) + json (2.6.3) json-canonicalization (0.3.0) json-ld (3.1.10) htmlentities (~> 4.3) @@ -602,7 +583,7 @@ GEM jsonlint (0.3.0) oj (~> 3) optimist (~> 3) - jwt (2.4.1) + jwt (2.5.0) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -676,7 +657,7 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - logger (1.5.1) + logger (1.5.2) lograge (0.11.2) actionpack (>= 4) activesupport (>= 4) @@ -708,7 +689,7 @@ GEM mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) - mini_magick (4.11.0) + mini_magick (4.12.0) mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) @@ -741,13 +722,18 @@ GEM builder (>= 3.1.0) faraday faraday_middleware - oauth (0.5.10) - oauth2 (1.4.9) + oauth (1.1.0) + oauth-tty (~> 1.0, >= 1.0.1) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + oauth-tty (1.0.5) + version_gem (~> 1.1, >= 1.1.1) + oauth2 (1.4.11) faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (>= 1.2, < 3) + rack (>= 1.2, < 4) oj (3.13.14) oj_mimic_json (1.0.1) okcomputer (1.18.4) @@ -768,17 +754,18 @@ GEM public_suffix (>= 2.0.0, < 2.1) power_converter (0.1.2) powerpack (0.1.3) + psych (3.3.4) public_suffix (2.0.5) puma (4.3.12) nio4r (~> 2.0) - qa (5.8.1) + qa (5.10.0) activerecord-import deprecation - faraday (< 2.0) + faraday (< 3.0, != 2.0.0) geocoder ldpath nokogiri (~> 1.6) - rails (>= 5.0, < 6.2) + rails (>= 5.0, < 7.1) rdf racc (1.6.0) rack (2.2.3.1) @@ -809,7 +796,7 @@ GEM rails-i18n (5.1.3) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - rails_autolink (1.1.6) + rails_autolink (1.1.7) rails (> 3.1) railties (5.2.8) actionpack (= 5.2.8) @@ -886,10 +873,10 @@ GEM redic (1.5.3) hiredis redis (4.6.0) - redis-namespace (1.8.2) - redis (>= 3.0.4) - redlock (1.2.2) - redis (>= 3.0.0, < 5.0) + redis-namespace (1.9.0) + redis (>= 4) + redlock (1.3.2) + redis (>= 3.0.0, < 6.0) reform (2.5.0) disposable (>= 0.4.2, < 0.5.0) representable (>= 2.4.0, < 3.1.0) @@ -1010,9 +997,9 @@ GEM connection_pool (>= 2.2.2) rack (~> 2.0) redis (>= 4.2.0) - signet (0.16.1) + signet (0.17.0) addressable (~> 2.8) - faraday (>= 0.17.5, < 3.0) + faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simple_form (5.1.0) @@ -1025,6 +1012,9 @@ GEM simplecov-html (0.12.3) simplecov_json_formatter (0.1.3) slop (4.9.2) + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) solr_wrapper (2.2.0) faraday retriable @@ -1071,7 +1061,7 @@ GEM thread (0.2.2) thread_safe (0.3.6) tilt (2.0.10) - tinymce-rails (6.0.3) + tinymce-rails (5.10.7) railties (>= 3.1.1) turbolinks (5.2.1) turbolinks-source (~> 5.2) @@ -1104,6 +1094,7 @@ GEM rdf-vocab reform (~> 2.2) reform-rails + version_gem (1.1.1) warden (1.2.9) rack (>= 2.0.9) web-console (3.7.0) @@ -1125,6 +1116,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) + zeitwerk (2.6.6) PLATFORMS ruby @@ -1152,6 +1144,7 @@ DEPENDENCIES devise-guests (~> 0.3) devise-i18n devise_invitable (~> 1.6) + dry-monads (~> 1.4.0) easy_translate factory_bot_rails fcrepo_wrapper (~> 0.4)