Merge pull request #6140 from avalonmediasystem/develop

Avalon 8.0 RC3
avalonmediasystem · Dec 6, 2024 · d051bc4 · d051bc4
2 parents 8016678 + 03bd02c
commit d051bc4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/Gemfile b/Gemfile
@@ -77,7 +77,7 @@ gem "omniauth-saml", "~> 2.0", ">= 2.2.1"
 # Media Access & Transcoding
 gem 'active_encode', '~> 1.2'
 gem 'audio_waveform-ruby', '~> 1.0.7', require: 'audio_waveform'
-gem 'browse-everything', git: "https://github.com/avalonmediasystem/browse-everything.git", branch: 'sharepoint_integration'
+gem 'browse-everything', git: "https://github.com/avalonmediasystem/browse-everything.git", tag: '1.4-avalon'
 gem 'fastimage'
 gem 'rest-client', '~> 2.0'
 gem 'roo'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -23,8 +23,8 @@ GIT
 
 GIT
   remote: https://github.com/avalonmediasystem/browse-everything.git
-  revision: eefa721865f392cd3b58f679a9761cbb3e4b5cc9
-  branch: sharepoint_integration
+  revision: 73cc89eb263bf5669d7bf29b6da73e8dcf1184ef
+  tag: 1.4-avalon
   specs:
     browse-everything (1.4.0)
       addressable (~> 2.5)
@@ -440,13 +440,15 @@ GEM
       mutex_m
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
-    google-apis-drive_v3 (0.59.0)
+    google-apis-drive_v3 (0.60.0)
       google-apis-core (>= 0.15.0, < 2.a)
     google-cloud-env (2.2.1)
       faraday (>= 1.0, < 3.a)
-    googleauth (1.11.2)
+    google-logging-utils (0.1.0)
+    googleauth (1.12.0)
       faraday (>= 1.0, < 3.a)
-      google-cloud-env (~> 2.1)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
       jwt (>= 1.4, < 3.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)

diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
     "@babel/preset-react": "^7.0.0",
     "@babel/runtime": "7",
-    "@samvera/ramp": "https://github.com/samvera-labs/ramp.git#25d3c47533c5a452dca4b129294f97c8ced24873",
+    "@samvera/ramp": "^3.3.0",
     "babel-plugin-macros": "^3.1.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "buffer": "^6.0.3",

diff --git a/yarn.lock b/yarn.lock
@@ -1497,9 +1497,10 @@
     estree-walker "^2.0.2"
     picomatch "^4.0.2"
 
-"@samvera/ramp@https://github.com/samvera-labs/ramp.git#25d3c47533c5a452dca4b129294f97c8ced24873":
-  version "3.2.1"
-  resolved "https://github.com/samvera-labs/ramp.git#25d3c47533c5a452dca4b129294f97c8ced24873"
+"@samvera/ramp@^3.3.0":
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/@samvera/ramp/-/ramp-3.3.0.tgz#411b45d4aeccf77106c38c7c9901bc6164b5e8a5"
+  integrity sha512-pldz5titVmJb2JcjHXulFdxG8uv4y5KTc1IbPYNAiZumqIqUTMZwgMNDfrgbKYyfOMj+BeEBOny2EspbvR5l5g==
   dependencies:
     "@rollup/plugin-json" "^6.0.1"
     "@silvermine/videojs-quality-selector" "^1.3.1"
@@ -1579,12 +1580,7 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
   integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
 
-"@types/estree@^1.0.0":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
-  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
-
-"@types/estree@^1.0.6":
+"@types/estree@^1.0.0", "@types/estree@^1.0.6":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
   integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
@@ -4753,9 +4749,9 @@ mammoth@^1.4.19:
     xmlbuilder "^10.0.0"
 
 manifesto.js@^4.1.0:
-  version "4.2.20"
-  resolved "https://registry.yarnpkg.com/manifesto.js/-/manifesto.js-4.2.20.tgz#67abb70dff9988c343e2d382379889ccbd6c2a0d"
-  integrity sha512-6J09N3pC335QirVZMXBkp4Mfa9IthKfy1BtGCvyre59z5h4l6OCc62NsyDFCGaysZRyuZ7zY4uzT7xU1g8yVHg==
+  version "4.2.21"
+  resolved "https://registry.yarnpkg.com/manifesto.js/-/manifesto.js-4.2.21.tgz#a62e9c7673467f7dd832a4fe27fe1c97a7b62d6c"
+  integrity sha512-C14J8zMSXlQaQjKR7KpIYEAXWquS2DtdxL8cFj1P2kc/ZJ5nWWmDUrthysVoQlRIzks5HtUNf5bStOwzhzarag==
   dependencies:
     "@edsilv/http-status-codes" "^1.0.3"
     "@iiif/vocabulary" "^1.0.26"