Merge pull request #5217 from pulibrary/update-gems

Update gems

.circleci/config.yml

@@ -111,7 +111,9 @@ jobs:
             zip -1 -r solr_config.zip ./*
             curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://localhost:8984/solr/admin/configs?action=UPLOAD&name=figgy"
             curl -H 'Content-type: application/json' http://localhost:8984/api/collections/ -d '{create: {name: figgy-core-test, config: figgy, numShards: 1}}'
+      - run: bundle exec rake db:environment:set
       - run: bundle exec rake db:migrate
+      - run: bundle exec spring stop
       - run:
           name: Run rspec in parallel
           command: |
@@ -174,6 +176,7 @@ jobs:
           command: node -v
       - run: gem install bundler -v '2.2.14'
       - run: bundle install --path vendor/bundle
+      - run: bundle exec spring stop
       - run: bundle exec rake rubocop
       - run: yarn lint
 workflows:

Gemfile

@@ -7,7 +7,7 @@ gem "blacklight", "7.11.1"
 gem "blacklight_range_limit"
 gem "bootstrap", "~> 4.0"
 gem "bootstrap_form", "~> 4.5.0"
-gem "bundler", "~> 2.0"
+gem "bundler", "2.2.16"
 gem "bunny"
 gem "dalli"
 gem "ddtrace"
@@ -16,7 +16,7 @@ gem "draper"
 gem "flutie"
 gem "honeybadger"
 gem "hydra-access-controls"
-gem "hydra-editor", "~> 5.0"
+gem "hydra-editor", "~> 6.0"
 gem "jbuilder"
 gem "jquery-rails"
 gem "jquery-ui-rails", "~> 5.0"
@@ -30,16 +30,15 @@ gem "pg", "~> 1.0"
 gem "puma", "~> 5.6.4"
 gem "rack", ">= 2.0.6"
 gem "rack-cors", require: "rack/cors"
-gem "rails", "5.2.5"
+gem "rails", "6.0.5"
 gem "recipient_interceptor"
 gem "redis-namespace"
 gem "reform", "2.2.4"
 gem "ruby-progressbar"
 gem "ruby_tika_app", github: "pulibrary/ruby_tika_app"
 gem "rubyzip", ">= 1.2.2"
-gem "sass-rails", "~> 5.0"
 gem "simple_form"
-gem "sprockets", ">= 3.7.2"
+gem "sprockets"
 gem "sqlite3"
 gem "title"
 gem "valkyrie", "~> 3.0.0-beta.1"
@@ -54,7 +53,6 @@ group :development do
   gem "ruby-prof"
   gem "solargraph", "~> 0.44.0"
   gem "spring"
-  gem "spring-commands-rspec"
   gem "web-console"
 end
 
@@ -68,7 +66,7 @@ group :development, :test do
   gem "pry-byebug"
   gem "pry-rails"
   gem "rails-controller-testing"
-  gem "rspec-rails", "~> 4.1"
+  gem "rspec-rails"
 end
 
 group :test do
@@ -108,7 +106,7 @@ gem "iiif_manifest", git: "https://github.com/samvera-labs/iiif_manifest"
 gem "iso-639"
 gem "jquery-datatables"
 gem "json-schema"
-gem "leaflet-rails", "~> 1.3.1"
+gem "leaflet-rails"
 gem "loofah", "~> 2.3.1"
 gem "m3u8"
 gem "marc", "~> 1.0.0"