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.

Sign up for GitHub

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

Upgrade json_api_client #2436

Merged
merged 1 commit into from
Sep 24, 2024
Merged

Upgrade json_api_client #2436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ gem 'cancancan'
gem 'devise', '~> 4.9'
gem 'govuk_notify_rails', '~> 3.0.0'

# Faraday middleware gem is required until Faraday is upgraded to version 2
gem 'faraday_middleware', '~> 1.2.1'
# rails GDS design system form builder
gem 'govuk_design_system_formbuilder', '~> 5.6'
gem 'haml-rails', '~> 2.1.0'
gem 'json_api_client', '~> 1.22'
gem 'json_api_client', '~> 1.23'
gem 'json-schema', '~> 5.0'
gem 'logstasher'
gem 'oauth2', '~> 2.0.9'
Expand Down
23 changes: 16 additions & 7 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ GEM
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-gzip (2.0.1)
faraday (>= 1.0)
zlib (~> 3.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
Expand All @@ -174,8 +177,9 @@ GEM
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday_middleware (1.2.1)
faraday (~> 1.0)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86_64-linux-gnu)
foreman (0.88.1)
globalid (1.2.1)
Expand Down Expand Up @@ -229,12 +233,12 @@ GEM
json (2.7.2)
json-schema (5.0.0)
addressable (~> 2.8)
json_api_client (1.22.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
json_api_client (1.23.0)
activemodel (>= 6.0.0)
activesupport (>= 6.0.0)
addressable (~> 2.2)
faraday (>= 0.15.2, < 2.0)
faraday_middleware (>= 0.9.0, < 2.0)
faraday (>= 1.10, < 3.0)
faraday-gzip (>= 1.0, < 3.0)
rack (>= 0.2)
jwt (2.9.0)
base64
Expand Down Expand Up @@ -276,6 +280,8 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.3)
nokogiri (1.16.7-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
notifications-ruby-client (6.2.0)
Expand Down Expand Up @@ -508,8 +514,10 @@ GEM
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.18)
zlib (3.1.1)

PLATFORMS
arm64-darwin-23
x86_64-linux

DEPENDENCIES
Expand All @@ -527,6 +535,7 @@ DEPENDENCIES
dotenv-rails
factory_bot_rails
faker
faraday_middleware (~> 1.2.1)
foreman
govuk_design_system_formbuilder (~> 5.6)
govuk_notify_rails (~> 3.0.0)
Expand All @@ -535,7 +544,7 @@ DEPENDENCIES
i18n-tasks (~> 1.0.14)
jsbundling-rails (~> 1.3)
json-schema (~> 5.0)
json_api_client (~> 1.22)
json_api_client (~> 1.23)
launchy
listen (>= 3.0.5, < 3.10)
logstasher
Expand Down