Upgrade to Rails 6.1

.circleci/config.yml

@@ -5,7 +5,7 @@ jobs:
   build:
     docker:
       # Primary container image where all steps run.
-      - image: avalonmediasystem/avalon:7.3.0-dev
+      - image: avalonmediasystem/avalon:7.5.0-dev-ruby3
         environment:
           - DATABASE_URL=postgresql://postgres@localhost:5432/postgres
           - FEDORA_URL=http://localhost:8080/fcrepo/rest
@@ -31,7 +31,7 @@ jobs:
     parameters:
       ruby_ver:
         description: 'Ruby version'
-        default: '2.7'
+        default: '3.1'
         type: 'string'
       solr_port:
         type: string
@@ -55,6 +55,7 @@ jobs:
           name: Clean out existing code
           command: rm -rf .[!.]* *
 
+      - run: git config --global --add safe.directory /home/app/avalon
       - samvera/cached_checkout
 
       - run: cp config/controlled_vocabulary.yml.example config/controlled_vocabulary.yml
@@ -138,7 +139,7 @@ jobs:
         default: 4
     docker:
       # Primary container image where all steps run.
-      - image: avalonmediasystem/avalon:7.3.0-dev
+      - image: avalonmediasystem/avalon:7.5.0-dev-ruby3
 
     working_directory: /home/app/avalon
 
@@ -161,10 +162,10 @@ workflows:
   build_test_report:
     jobs:
       - build:
-          ruby_ver: '2.7'
-          name: 'Ruby2-7'
+          ruby_ver: '3.2'
+          name: 'Ruby3-2'
           parallelism: 4
       - upload-coverage:
           parallelism: 4
           requires:
-            - Ruby2-7
+            - Ruby3-2

Dockerfile

@@ -1,5 +1,5 @@
 # Base stage for building gems
-FROM        ruby:2.7-bullseye as bundle
+FROM        ruby:3.1-bullseye as bundle
 LABEL       stage=build
 LABEL       project=avalon
 RUN        apt-get update && apt-get upgrade -y build-essential && apt-get autoremove \
@@ -30,7 +30,7 @@ RUN         bundle config set --local without 'production' \
 
 
 # Download binaries in parallel
-FROM        ruby:2.7-bullseye as download
+FROM        ruby:3.1-bullseye as download
 LABEL       stage=build
 LABEL       project=avalon
 RUN         curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-linux-amd64-v0.6.1.tar.gz | tar xvz -C /usr/bin/
@@ -43,7 +43,7 @@ RUN      apt-get -y update && apt-get install -y ffmpeg
 
 
 # Base stage for building final images
-FROM        ruby:2.7-slim-bullseye as base
+FROM        ruby:3.1-slim-bullseye as base
 LABEL       stage=build
 LABEL       project=avalon
 RUN         echo "deb     http://ftp.us.debian.org/debian/    bullseye main contrib non-free"  >  /etc/apt/sources.list.d/bullseye.list \

Gemfile

@@ -3,7 +3,9 @@ source 'https://rubygems.org'
 # Core rails
 gem 'bootsnap', require: false
 gem 'listen'
-gem 'rails', '=6.0.5.1'
+gem 'net-smtp', require: false
+gem 'psych', '< 4'
+gem 'rails', '=6.1.7.2'
 gem 'sprockets', '~>3.7.2'
 #gem 'sprockets-rails', require: 'sprockets/railtie'
 gem 'sqlite3'
@@ -25,13 +27,14 @@ gem 'uglifier', '>= 1.3.0'
 gem 'webpacker'
 
 # Core Samvera
-gem 'active-fedora', '~> 13.2', '>= 13.2.5'
-gem 'active_fedora-datastreams', '~> 0.4'
+#gem 'active-fedora', '~> 14.0'
+gem 'active-fedora', git: "https://github.com/samvera/active_fedora.git", branch: "errors_fix"
+gem 'active_fedora-datastreams', '~> 0.5'
 gem 'hydra-head', '~> 12.0'
-gem 'ldp', '~> 1.0.3'
-gem 'noid-rails', '~> 3.0.1'
+gem 'ldp', '~> 1.1.0'
+gem 'noid-rails', '~> 3.1'
+gem 'om', git: 'https://github.com/avalonmediasystem/om.git', branch: 'ruby3'
 gem 'rdf-rdfxml'
-gem 'rdf-vocab', '< 3.1.5'
 
 # Samvera version pins
 gem 'blacklight', '~> 7.25'
@@ -53,7 +56,8 @@ gem 'iiif_manifest', '~> 0.6'
 gem 'rack-cors', require: 'rack/cors'
 gem 'rails_same_site_cookie'
 gem 'recaptcha', require: 'recaptcha/rails'
-gem 'samvera-persona', '~> 0.3'
+#gem 'samvera-persona', '~> 0.3'
+gem 'samvera-persona', git: "https://github.com/samvera-labs/samvera-persona.git", branch: "newer_rails"
 gem 'speedy-af', '~> 0.3'
 
 # Avalon Components
@@ -75,13 +79,13 @@ gem 'audio_waveform-ruby', '~> 1.0.7', require: 'audio_waveform'
 gem 'browse-everything', git: "https://github.com/avalonmediasystem/browse-everything.git", branch: 'v1.2-avalon'
 gem 'fastimage'
 gem 'media_element_add_to_playlist', git: 'https://github.com/avalonmediasystem/media-element-add-to-playlist.git', tag: 'avalon-r6.5'
-gem 'mediainfo', git: "https://github.com/avalonmediasystem/mediainfo.git", branch: 'avalon_fixes'
+gem 'mediainfo', git: "https://github.com/avalonmediasystem/mediainfo.git", branch: 'rails6.1'
 gem 'rest-client', '~> 2.0'
 gem 'roo'
 gem 'wavefile', '~> 1.0.1'
 
 # Data Translation & Normalization
-gem 'edtf'
+gem 'edtf', '>= 3.1.1'
 gem 'iconv', '~> 1.0.6'
 gem 'marc'
 
@@ -142,7 +146,7 @@ group :test do
   gem 'shoulda-matchers'
   gem 'simplecov'
   gem 'webdrivers', '~> 3.0'
-  gem 'webmock', '~> 3.5.1'
+  gem 'webmock', '~> 3.5'
 end
 
 group :production do