From ec36aca504f81a69e9ba7857413306114a0e788e Mon Sep 17 00:00:00 2001 From: Daniel Pierce Date: Tue, 21 Jan 2025 15:27:21 -0500 Subject: [PATCH 1/2] Pin concurrent-ruby 1.3.5 exposes rails bug that is fixed in rails 7 --- hyrax.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hyrax.gemspec b/hyrax.gemspec index 06cf5c4d05..5e2e7ec388 100644 --- a/hyrax.gemspec +++ b/hyrax.gemspec @@ -43,7 +43,7 @@ SUMMARY spec.add_dependency 'browse-everything', '>= 0.16', '< 2.0' spec.add_dependency 'carrierwave', '~> 1.0' spec.add_dependency 'clipboard-rails', '~> 1.5' - spec.add_dependency 'concurrent-ruby', '~> 1.0' + spec.add_dependency 'concurrent-ruby', '1.3.4' # Pinned until Rails 7 update spec.add_dependency 'connection_pool', '~> 2.4' spec.add_dependency 'draper', '~> 4.0' spec.add_dependency 'dry-logic', '~> 1.5' From 597e0774f02b315b36bb9229ce14e7da1e283bc3 Mon Sep 17 00:00:00 2001 From: Randall Floyd Date: Mon, 3 Feb 2025 08:52:55 -0500 Subject: [PATCH 2/2] Version bump to 5.0.3 after fixing concurrent-ruby --- documentation/developing-your-hyrax-based-app.md | 4 ++-- lib/hyrax/version.rb | 2 +- template.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/developing-your-hyrax-based-app.md b/documentation/developing-your-hyrax-based-app.md index c87ce51445..97524b7bef 100644 --- a/documentation/developing-your-hyrax-based-app.md +++ b/documentation/developing-your-hyrax-based-app.md @@ -32,7 +32,7 @@ You can also try [Running Hyrax-based application in local VM](https://github.co During development, running only the dependent services in a container environment may be beneficial. This avoids potential headaches concerning file permissions and eases the use of debugging tools. The application generation instructions below use [Lando](https://lando.dev) to achieve this setup. This document contains instructions specific to setting up an app with __Hyrax -v5.0.2__. If you are looking for instructions on installing a different +v5.0.3__. If you are looking for instructions on installing a different version, be sure to select the appropriate branch or tag from the drop-down menu above. @@ -148,7 +148,7 @@ Generate a new Rails application using the template. **NOTE:** `HYRAX_SKIP_WINGS` is needed here to avoid loading the Wings compatibility layer during the application generation process. ```shell -HYRAX_SKIP_WINGS=true rails _6.1.7.7_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.0.2/template.rb +HYRAX_SKIP_WINGS=true rails _6.1.7.7_ new my_app --database=postgresql -m https://raw.githubusercontent.com/samvera/hyrax/hyrax-v5.0.3/template.rb ``` Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including: diff --git a/lib/hyrax/version.rb b/lib/hyrax/version.rb index 280ff34d93..6063dd4639 100644 --- a/lib/hyrax/version.rb +++ b/lib/hyrax/version.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true module Hyrax - VERSION = '5.0.2' + VERSION = '5.0.3' end diff --git a/template.rb b/template.rb index cf0cc17c58..b976535e13 100644 --- a/template.rb +++ b/template.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true -gem 'hyrax', '5.0.2' +gem 'hyrax', '5.0.3' run 'bundle install' generate 'hyrax:install', '-f'