Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Support Ruby 3.3 and Rails 7.2 #6913

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .dassie/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ gem 'jbuilder', '~> 2.5'
gem 'jquery-rails'
gem 'pg', '~> 1.3'
gem 'puma'
gem 'rails', '~> 6.1'
gem 'rails', '~> 7.2', '< 8.0'
gem 'riiif', '~> 2.1'
gem 'rsolr', '>= 1.0', '< 3'
gem 'sass-rails', '~> 6.0'
Expand All @@ -57,4 +57,4 @@ group :development, :test do
gem 'pry-doc'
gem 'pry-rails'
gem 'pry-rescue'
end
end
2 changes: 1 addition & 1 deletion .github/workflows/lint-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.2'
ruby-version: '3.3'
bundler-cache: true
cache-version: 1
- name: Rubocop
Expand Down
2 changes: 1 addition & 1 deletion .koppie/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ gem 'jbuilder', '~> 2.5'
gem 'jquery-rails'
gem 'pg', '~> 1.3'
gem 'puma'
gem 'rails', '~> 6.1'
gem 'rails', '~> 7.2', '< 8.0'
gem 'riiif', '~> 2.1'
gem 'rsolr', '>= 1.0', '< 3'
gem 'sass-rails', '~> 6.0'
Expand Down
1 change: 1 addition & 0 deletions app/services/hyrax/listeners.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ module Listeners
autoload :ACLIndexListener
autoload :ActiveFedoraACLIndexListener
autoload :BatchNotificationListener
autoload :FileListener
autoload :FileMetadataListener
autoload :FileSetLifecycleListener
autoload :FileSetLifecycleNotificationListener
Expand Down
8 changes: 4 additions & 4 deletions hyrax.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ SUMMARY
# NOTE: rails does not follow sem-ver conventions, it's
# minor version releases can include breaking changes; see
# http://guides.rubyonrails.org/maintenance_policy.html
spec.add_dependency 'rails', '~> 6.1'
spec.add_dependency 'rails', '~> 7.2', '< 8.0'

spec.add_dependency 'active-fedora', '~> 14.0'
spec.add_dependency 'active-fedora', '~> 15.0'
spec.add_dependency 'almond-rails', '~> 0.1'
spec.add_dependency 'awesome_nested_set', '~> 3.1'
spec.add_dependency 'blacklight', '~> 7.29'
Expand All @@ -57,10 +57,10 @@ SUMMARY
spec.add_dependency 'flot-rails', '~> 0.0.6'
spec.add_dependency 'font-awesome-rails', '~> 4.2'
spec.add_dependency 'google-analytics-data', '~> 0.6'
spec.add_dependency 'hydra-derivatives', '~> 3.3'
spec.add_dependency 'hydra-derivatives', '~> 4.0'
spec.add_dependency 'hydra-editor', '~> 6.0'
spec.add_dependency 'hydra-file_characterization', '~> 1.1'
spec.add_dependency 'hydra-head', '~> 12.0'
spec.add_dependency 'hydra-head', '~> 13.0'
spec.add_dependency 'hydra-works', '>= 0.16'
spec.add_dependency 'iiif_manifest', '>= 0.3', '< 2.0'
spec.add_dependency 'json-schema' # for Arkivo
Expand Down
1 change: 1 addition & 0 deletions lib/hyrax/configuration.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true
require 'hyrax/callbacks'
require 'hyrax/role_registry'

module Hyrax
Expand Down
Loading