diff --git a/Gemfile b/Gemfile index 5b66aef3b..44c53cf8c 100644 --- a/Gemfile +++ b/Gemfile @@ -67,9 +67,9 @@ end group :development, :test do gem 'bixby' gem 'byebug' - gem 'rspec-rails', '~> 4' # Can update to 5.x after updating to Rails 6.x + gem 'rspec-rails' # , '~> 4' # Can update to 5.x after updating to Rails 6.x gem 'rubocop', require: false - gem 'solr_wrapper', '~> 2' # hi + gem 'solr_wrapper' # , '~> 2' # hi end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 5d5974ccf..7c1ff8f18 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -222,6 +222,7 @@ GEM diff-lcs (1.5.0) diffy (3.4.2) docile (1.4.0) + domain_name (0.6.20231109) erubi (1.12.0) execjs (2.9.1) factory_bot (6.2.1) @@ -255,6 +256,9 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) ffi (1.16.3) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake friendly_id (5.5.1) activerecord (>= 4.0.0) github-markup (4.0.2) @@ -266,6 +270,14 @@ GEM tilt (>= 1.2) hashdiff (1.0.1) hashie (5.0.0) + http (5.1.1) + addressable (~> 2.8) + http-cookie (~> 1.0) + http-form_data (~> 2.2) + llhttp-ffi (~> 0.4.0) + http-cookie (1.0.5) + domain_name (~> 0.5) + http-form_data (2.3.0) i18n (1.14.1) concurrent-ruby (~> 1.0) i18n-active_record (1.3.0) @@ -312,6 +324,9 @@ GEM railties (>= 4.2.0) legato (0.7.0) multi_json + llhttp-ffi (0.4.0) + ffi-compiler (~> 1.0) + rake (~> 13.0) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -327,6 +342,7 @@ GEM nokogiri (~> 1) mini_magick (4.12.0) mini_mime (1.1.5) + minitar (0.9) minitest (5.20.0) multi_json (1.15.0) multi_xml (0.6.0) @@ -451,14 +467,14 @@ GEM rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (4.1.2) - actionpack (>= 4.2) - activesupport (>= 4.2) - railties (>= 4.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) + rspec-rails (6.0.3) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) rspec-support (3.12.1) rubocop (1.57.2) json (~> 2.3) @@ -534,11 +550,11 @@ GEM snaky_hash (2.0.1) hashie version_gem (~> 1.1, >= 1.1.1) - solr_wrapper (2.2.0) - faraday + solr_wrapper (4.0.2) + http + minitar retriable ruby-progressbar - rubyzip solrizer (4.1.0) activesupport nokogiri @@ -636,14 +652,14 @@ DEPENDENCIES rails (= 7.0.2) riiif rsolr (>= 1.0) - rspec-rails (~> 4) + rspec-rails rubocop sass-rails (~> 5.0) selenium-webdriver (~> 4.1.0) simplecov simplecov-lcov (~> 0.8.0) sitemap_generator - solr_wrapper (~> 2) + solr_wrapper solrizer twitter-typeahead-rails (= 0.11.1.pre.corejavascript) uglifier (>= 1.3.0)