Skip to content

Commit c35eb41

Browse files
authored
Merge pull request #2641 from sciencehistory/update_gem_dependencies
update gem dependencies
2 parents c11a92c + 2a5e339 commit c35eb41

File tree

3 files changed

+82
-84
lines changed

3 files changed

+82
-84
lines changed

Gemfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ gem 'lockbox'
1414
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
1515
gem 'rails', '~> 7.1.3'
1616

17-
# While rails 7.1 supports rack 3, other things we're using actually don't yet,
18-
# but bundler can incorrectly resolve to REALLY OLD verisons of dependencies
19-
# if we don't tell it, actually, we're not ready for rack 3. See:
17+
# Ensure we are using rack 3, with a new sinatra that can use it. Both of these
18+
# are indirect dependencies, in here only to force bundler NOT to do a weird
19+
# resolution to old versions of sinatra!
2020
# https://bibwild.wordpress.com/2023/11/09/beware-sinatra-rails-7-1-rack-3-resque-bundler-dependency-resolution/
21-
gem "rack", "~> 2.2"
21+
gem "rack", ">= 3.0"
22+
gem "sinatra", ">= 4.0"
2223

2324
# Our JS/CSS/asset bundler
2425
# After updating, you always need to run `bundle exec vite upgrade` to update JS packages to match
@@ -38,7 +39,7 @@ gem "mail", ">= 2.8.0.rc1", "< 3"
3839
gem "net-protocol", "!= 0.2.0"
3940

4041
gem "view_component", "~> 3.9"
41-
gem "alba", "~> 2.0" # for JSON serialization of models
42+
gem "alba", "~> 3.1" # for JSON serialization of models
4243

4344
# Scout is a monitoring tool we are experimenting with
4445
gem 'scout_apm'
@@ -159,7 +160,7 @@ gem 'matrix', '~> 0.4'
159160

160161
gem "pdf-reader", "~> 2.2" # simple metadata extraction from pdfs
161162
gem 'rubyzip', '~> 2.0'
162-
gem 'browser', '~> 5.0' # browser user-agent detection, maybe only for IE-unsupported warning.
163+
gem 'browser', '~> 6.0' # browser user-agent detection, maybe only for IE-unsupported warning.
163164

164165

165166
# Until oai 1.0 is released...

0 commit comments

Comments
 (0)