Skip to content

Commit

Permalink
🛠️ Upgrade rails and update Bulkrax
Browse files Browse the repository at this point in the history 
This commit will upgrade the application from Rails 6.0 to 6.1. It will
also update Bulkrax to a custom branch that has a fix for Rails 6.1.

Ref:
  - scientist-softserv#23
  • Loading branch information
@kirkkwang
kirkkwang committed Aug 8, 2023
1 parent f678742 commit f229269
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 78 deletions.
20 changes: 12 additions & 8 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ end
plugin 'bootboot', '~> 0.2.1'

if ENV['DEPENDENCIES_NEXT'] && !ENV['DEPENDENCIES_NEXT'].empty?
gem 'rails', '6.0'
gem 'rails', '~> 6.0'
gem 'hyrax-batch_ingest', git: 'https://github.com/samvera-labs/hyrax-batch_ingest', branch: 'dependency-upgrades'
gem 'hyrax', '~> 4.0'
# Use SCSS for stylesheets
Expand All @@ -17,6 +17,11 @@ if ENV['DEPENDENCIES_NEXT'] && !ENV['DEPENDENCIES_NEXT'].empty?
gem 'hydra-role-management', '1.1.0'
gem 'blacklight', '~> 7.29'
gem 'blacklight_advanced_search', '7.0'
group :bulkrax do
# our custom changes require us to lock in the version of bulkrax
gem 'bulkrax', git: 'https://github.com/samvera-labs/bulkrax.git', branch: 'gbh-patch'
gem 'willow_sword', git: 'https://github.com/notch8/willow_sword.git'
end
else
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.5'
Expand All @@ -27,13 +32,12 @@ else
gem 'sony_ci_api', github: 'WGBH-MLA/sony_ci_api_rewrite', branch: 'v0.1'
gem 'hydra-role-management', '~> 1.0'
gem 'blacklight_advanced_search', '~> 6.4.0'
end

# Bulkrax
group :bulkrax do
# our custom changes require us to lock in the version of bulkrax
gem 'bulkrax', git: 'https://github.com/samvera-labs/bulkrax.git', ref: '23efea3fd9d8d98746b73e570e0dc214ff764271'
gem 'willow_sword', git: 'https://github.com/notch8/willow_sword.git'
# Bulkrax
group :bulkrax do
# our custom changes require us to lock in the version of bulkrax
gem 'bulkrax', git: 'https://github.com/samvera-labs/bulkrax.git', ref: '23efea3fd9d8d98746b73e570e0dc214ff764271'
gem 'willow_sword', git: 'https://github.com/notch8/willow_sword.git'
end
end

gem 'dotenv-rails'
Expand Down
139 changes: 69 additions & 70 deletions Gemfile_next.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ GIT

GIT
remote: https://github.com/samvera-labs/bulkrax.git
revision: 23efea3fd9d8d98746b73e570e0dc214ff764271
ref: 23efea3fd9d8d98746b73e570e0dc214ff764271
revision: 1d176b340a275647f1aa5659e470aa7b79d4897e
branch: gbh-patch
specs:
bulkrax (1.0.2)
bagit (~> 0.4)
Expand Down Expand Up @@ -49,38 +49,40 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (6.0.0)
actionpack (= 6.0.0)
actioncable (6.1.7.4)
actionpack (= 6.1.7.4)
activesupport (= 6.1.7.4)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.0)
actionpack (= 6.0.0)
activejob (= 6.0.0)
activerecord (= 6.0.0)
activestorage (= 6.0.0)
activesupport (= 6.0.0)
actionmailbox (6.1.7.4)
actionpack (= 6.1.7.4)
activejob (= 6.1.7.4)
activerecord (= 6.1.7.4)
activestorage (= 6.1.7.4)
activesupport (= 6.1.7.4)
mail (>= 2.7.1)
actionmailer (6.0.0)
actionpack (= 6.0.0)
actionview (= 6.0.0)
activejob (= 6.0.0)
actionmailer (6.1.7.4)
actionpack (= 6.1.7.4)
actionview (= 6.1.7.4)
activejob (= 6.1.7.4)
activesupport (= 6.1.7.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.0)
actionview (= 6.0.0)
activesupport (= 6.0.0)
rack (~> 2.0)
actionpack (6.1.7.4)
actionview (= 6.1.7.4)
activesupport (= 6.1.7.4)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.0)
actionpack (= 6.0.0)
activerecord (= 6.0.0)
activestorage (= 6.0.0)
activesupport (= 6.0.0)
actiontext (6.1.7.4)
actionpack (= 6.1.7.4)
activerecord (= 6.1.7.4)
activestorage (= 6.1.7.4)
activesupport (= 6.1.7.4)
nokogiri (>= 1.8.5)
actionview (6.0.0)
activesupport (= 6.0.0)
actionview (6.1.7.4)
activesupport (= 6.1.7.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
Expand All @@ -103,33 +105,35 @@ GEM
active_encode (0.8.2)
rails
sprockets (< 4)
activejob (6.0.0)
activesupport (= 6.0.0)
activejob (6.1.7.4)
activesupport (= 6.1.7.4)
globalid (>= 0.3.6)
activemodel (6.0.0)
activesupport (= 6.0.0)
activemodel (6.1.7.4)
activesupport (= 6.1.7.4)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (6.0.0)
activemodel (= 6.0.0)
activesupport (= 6.0.0)
activerecord (6.1.7.4)
activemodel (= 6.1.7.4)
activesupport (= 6.1.7.4)
activerecord-import (1.4.1)
activerecord (>= 4.2)
activerecord-nulldb-adapter (0.9.0)
activerecord (>= 5.2.0, < 7.1)
activestorage (6.0.0)
actionpack (= 6.0.0)
activejob (= 6.0.0)
activerecord (= 6.0.0)
marcel (~> 0.3.1)
activesupport (6.0.0)
activestorage (6.1.7.4)
actionpack (= 6.1.7.4)
activejob (= 6.1.7.4)
activerecord (= 6.1.7.4)
activesupport (= 6.1.7.4)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.1, >= 2.1.8)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
almond-rails (0.3.0)
Expand Down Expand Up @@ -627,17 +631,13 @@ GEM
mailboxer (0.15.1)
carrierwave (>= 0.5.8)
rails (>= 5.0.0)
marcel (0.3.3)
mimemagic (~> 0.3.2)
marcel (1.0.2)
matrix (0.4.2)
memoist (0.16.2)
method_source (1.0.0)
mime-types (3.5.0)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0808)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mini_magick (4.12.0)
mini_mime (1.1.5)
mini_portile2 (2.8.4)
Expand Down Expand Up @@ -735,20 +735,20 @@ GEM
rdf (~> 3.2)
rack-test (2.1.0)
rack (>= 1.3)
rails (6.0.0)
actioncable (= 6.0.0)
actionmailbox (= 6.0.0)
actionmailer (= 6.0.0)
actionpack (= 6.0.0)
actiontext (= 6.0.0)
actionview (= 6.0.0)
activejob (= 6.0.0)
activemodel (= 6.0.0)
activerecord (= 6.0.0)
activestorage (= 6.0.0)
activesupport (= 6.0.0)
bundler (>= 1.3.0)
railties (= 6.0.0)
rails (6.1.7.4)
actioncable (= 6.1.7.4)
actionmailbox (= 6.1.7.4)
actionmailer (= 6.1.7.4)
actionpack (= 6.1.7.4)
actiontext (= 6.1.7.4)
actionview (= 6.1.7.4)
activejob (= 6.1.7.4)
activemodel (= 6.1.7.4)
activerecord (= 6.1.7.4)
activestorage (= 6.1.7.4)
activesupport (= 6.1.7.4)
bundler (>= 1.15.0)
railties (= 6.1.7.4)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
Expand All @@ -765,12 +765,12 @@ GEM
actionview (> 3.1)
activesupport (> 3.1)
railties (> 3.1)
railties (6.0.0)
actionpack (= 6.0.0)
activesupport (= 6.0.0)
railties (6.1.7.4)
actionpack (= 6.1.7.4)
activesupport (= 6.1.7.4)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
rake (>= 12.2)
thor (~> 1.0)
rainbow (3.1.1)
rake (13.0.6)
rb-fsevent (0.11.2)
Expand Down Expand Up @@ -1040,7 +1040,6 @@ GEM
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.2.2)
thread_safe (0.3.6)
tilt (2.2.0)
timeout (0.4.0)
tinymce-rails (5.10.7.1)
Expand All @@ -1051,8 +1050,8 @@ GEM
turbolinks-source (5.2.0)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.11)
thread_safe (~> 0.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uber (0.1.0)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
Expand Down Expand Up @@ -1151,7 +1150,7 @@ DEPENDENCIES
pbcore (~> 0.3.0)
pry-byebug
puma (~> 4.3)
rails (= 6.0)
rails (~> 6.0)
rails-controller-testing
react-rails
redis (~> 4.0)
Expand Down

0 comments on commit f229269

Please sign in to comment.