From 76176286b817c869a80b922ccacc6fecea3827e2 Mon Sep 17 00:00:00 2001 From: Alexandra Catalina Date: Tue, 14 Feb 2023 11:28:56 -0800 Subject: [PATCH] use valkyrie 3.x (#5948) * use valkyrie 3.x * Install lsof needed by shared valkyrie spec --------- Co-authored-by: Daniel Pierce --- .circleci/config.yml | 2 +- .koppie/Gemfile | 1 - hyrax.gemspec | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 97543ef1dc..9db750bf4d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -127,7 +127,7 @@ jobs: name: Install system dependencies command: | sudo apt-get update - sudo apt-get install imagemagick librsvg2-bin + sudo apt-get install imagemagick librsvg2-bin lsof - browser-tools/install-chrome - browser-tools/install-chromedriver - run: diff --git a/.koppie/Gemfile b/.koppie/Gemfile index c9df89e1cc..dc7bb99357 100644 --- a/.koppie/Gemfile +++ b/.koppie/Gemfile @@ -29,7 +29,6 @@ gem 'turbolinks', '~> 5' gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript' gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'uglifier', '>= 1.3.0' -gem 'valkyrie', '~> 2', '>= 2.1.1' group :development do gem 'better_errors' # add command line in browser when errors diff --git a/hyrax.gemspec b/hyrax.gemspec index 8cdcc93be6..c9ec031ee4 100644 --- a/hyrax.gemspec +++ b/hyrax.gemspec @@ -83,7 +83,7 @@ SUMMARY spec.add_dependency 'samvera-nesting_indexer', '~> 2.0' spec.add_dependency 'signet' spec.add_dependency 'tinymce-rails', '~> 5.10' - spec.add_dependency 'valkyrie', '~> 2', '>= 2.1.1' + spec.add_dependency 'valkyrie', '~> 3.0.1' spec.add_dependency 'view_component', '~> 2.74.1' # Pin until blacklight is updated with workaround for https://github.com/ViewComponent/view_component/issues/1565 spec.add_dependency 'sprockets', '~> 3.7' spec.add_dependency 'sass-rails', '~> 6.0'