From c10f37ed1f938dc49814c46162e83bcaa63311d2 Mon Sep 17 00:00:00 2001
From: Mason Ballengee <masaball@iu.edu>
Date: Wed, 14 Feb 2024 10:47:25 -0500
Subject: [PATCH] Use released versions of dependencies

Bump iiif-manifest and active-encode to their most recent release in
preparation for 7.7
---
 Gemfile      |  4 ++--
 Gemfile.lock | 25 +++++++------------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/Gemfile b/Gemfile
index c938c3cfca..f9c93870e7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -53,7 +53,7 @@ gem 'avalon-about', git: 'https://github.com/avalonmediasystem/avalon-about.git'
 #gem 'bootstrap-sass', '< 3.4.1' # Pin to less than 3.4.1 due to change in behavior with popovers
 gem 'bootstrap-toggle-rails'
 gem 'bootstrap_form'
-gem 'iiif_manifest', git: 'https://github.com/samvera-labs/iiif_manifest.git', branch: 'main'
+gem 'iiif_manifest', '>= 1.4.0'
 gem 'rack-cors', require: 'rack/cors'
 gem 'rails_same_site_cookie'
 gem 'recaptcha', require: 'recaptcha/rails'
@@ -74,7 +74,7 @@ gem 'omniauth-lti', git: "https://github.com/avalonmediasystem/omniauth-lti.git"
 gem "omniauth-saml", "~> 2.0"
 
 # Media Access & Transcoding
-gem 'active_encode', git: "https://github.com/samvera-labs/active_encode.git"
+gem 'active_encode', '>= 1.2.2'
 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'
diff --git a/Gemfile.lock b/Gemfile.lock
index c01d303a69..7583e3b1d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -65,22 +65,6 @@ GIT
       ims-lti
       omniauth
 
-GIT
-  remote: https://github.com/samvera-labs/active_encode.git
-  revision: cad5ced9ca18f11c4003e839ae836e815eeec6df
-  specs:
-    active_encode (1.2.1)
-      addressable (~> 2.8)
-      rails
-
-GIT
-  remote: https://github.com/samvera-labs/iiif_manifest.git
-  revision: 1ede49aec4fc01582df8132e000121edbdcfac4a
-  branch: main
-  specs:
-    iiif_manifest (1.3.1)
-      activesupport (>= 4)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -151,6 +135,9 @@ GEM
     active_elastic_job (3.2.0)
       aws-sdk-sqs (~> 1)
       rails (>= 5.2.6, < 7.1)
+    active_encode (1.2.2)
+      addressable (~> 2.8)
+      rails
     active_fedora-datastreams (0.5.0)
       active-fedora (>= 11.0.0.pre)
       activemodel (>= 5.2)
@@ -503,6 +490,8 @@ GEM
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     iconv (1.0.8)
+    iiif_manifest (1.4.0)
+      activesupport (>= 4)
     ims-lti (1.1.13)
       builder
       oauth (>= 0.4.5, < 0.6)
@@ -985,7 +974,7 @@ DEPENDENCIES
   active-fedora (~> 14.0, >= 14.0.1)
   active_annotations (~> 0.4)
   active_elastic_job
-  active_encode!
+  active_encode (>= 1.2.2)
   active_fedora-datastreams (~> 0.5)
   activejob-traffic_control
   activejob-uniqueness
@@ -1041,7 +1030,7 @@ DEPENDENCIES
   hooks
   hydra-head (~> 12.0)
   iconv (~> 1.0.6)
-  iiif_manifest!
+  iiif_manifest (>= 1.4.0)
   ims-lti (~> 1.1.13)
   jbuilder (~> 2.0)
   jquery-datatables