Upgrade to Hyrax ~>2.3.0 (#1545)

samvera · Oct 5, 2018 · 7db4497 · 7db4497
1 parent 5243987
commit 7db4497
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/Gemfile b/Gemfile
@@ -77,7 +77,7 @@ end
 
 gem 'blacklight', '~> 6.7'
 
-gem 'hyrax', '2.2.0'
+gem 'hyrax', '~>2.3.0'
 gem 'rsolr', '~> 2.0'
 
 gem 'devise'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -43,8 +43,8 @@ GEM
     active_elastic_job (2.0.1)
       aws-sdk (~> 2)
       rails (>= 4.2)
-    active_encode (0.1.1)
-      activesupport
+    active_encode (0.4)
+      rails
     activejob (5.1.6)
       activesupport (= 5.1.6)
       globalid (>= 0.3.6)
@@ -266,18 +266,19 @@ GEM
       railties (>= 3.2, < 6.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    google-api-client (0.23.4)
+    google-api-client (0.24.2)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
       httpclient (>= 2.8.1, < 3.0)
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
+      signet (~> 0.10)
     google_drive (2.1.3)
       google-api-client (>= 0.11.0, < 1.0.0)
       googleauth (>= 0.5.0, < 1.0.0)
       nokogiri (>= 1.5.3, < 2.0.0)
-    googleauth (0.6.5)
+    googleauth (0.6.6)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.12)
@@ -333,15 +334,17 @@ GEM
       hydra-access-controls (= 10.5.1)
       hydra-core (= 10.5.1)
       rails (>= 3.2.6)
-    hydra-pcdm (0.11.0)
+    hydra-pcdm (1.0.0)
       active-fedora (>= 10, < 13)
+      activesupport (< 5.2)
       mime-types (>= 1)
-    hydra-works (0.17.0)
+    hydra-works (1.0.0)
+      activesupport (>= 4.2.10, < 5.2)
       hydra-derivatives (~> 3.0)
       hydra-file_characterization (~> 0.3, >= 0.3.3)
       hydra-pcdm (>= 0.9)
       om (~> 3.1)
-    hyrax (2.2.0)
+    hyrax (2.3.3)
       active-fedora (~> 11.5, >= 11.5.2)
       almond-rails (~> 0.1)
       awesome_nested_set (~> 3.1)
@@ -360,8 +363,8 @@ GEM
       hydra-derivatives (~> 3.3)
       hydra-editor (>= 3.3, < 5.0)
       hydra-head (>= 10.5.0)
-      hydra-works (~> 0.16)
-      iiif_manifest (>= 0.3, < 0.5)
+      hydra-works (>= 0.16, < 2.0)
+      iiif_manifest (>= 0.3, < 0.6)
       jquery-datatables-rails (~> 3.4)
       jquery-ui-rails (~> 6.0)
       json-schema
@@ -518,7 +521,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
-    mini_magick (4.8.0)
+    mini_magick (4.9.2)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
@@ -596,7 +599,7 @@ GEM
     public_suffix (3.0.2)
     pul_uv_rails (2.0.1)
     puma (3.9.1)
-    qa (2.0.1)
+    qa (2.1.1)
       activerecord-import
       deprecation
       faraday
@@ -788,7 +791,7 @@ GEM
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
       redis (~> 3.3, >= 3.3.3)
-    signet (0.9.0)
+    signet (0.10.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
@@ -857,7 +860,7 @@ GEM
     thread_safe (0.3.6)
     tilt (2.0.8)
     tins (1.14.0)
-    tinymce-rails (4.8.2)
+    tinymce-rails (4.8.3)
       railties (>= 3.1.1)
     turbolinks (5.0.1)
       turbolinks-source (~> 5)
@@ -918,7 +921,7 @@ DEPENDENCIES
   fcrepo_wrapper (~> 0.4)
   flipflop (~> 2.3)
   honeybadger (~> 3.0)
-  hyrax (= 2.2.0)
+  hyrax (~> 2.3.0)
   i18n-debug
   i18n-tasks
   iiif_manifest (~> 0.3.0)
@@ -963,4 +966,4 @@ DEPENDENCIES
   zk
 
 BUNDLED WITH
-   1.16.2
+   1.16.3