Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
Upgrade
json_api_client
andfaraday_middleware
together.Ticket
N/A
Why
json_api_client
has been updated to allow compatibility with both version 1 and 2 of Faraday. To do this thefaraday_middleware
gem was removed as this is not compatible with Faraday version 2. To facilitate this some middleware has been built in to Faraday 1 to mirror the behaviour of version 2. This has been done for the JSON firmware, whichjson_api_client
uses, but not for the OAuth2 middleware, which we still require. Simply addingfaraday_middleware
back in for the OAuth2 middleware causes conflicts as the JSON middleware exists twice.How
Add
faraday_middleware
and require at least version 1.2.1. This version has been fixed (lostisland/faraday#1595) to resolve conflicts and favours the built in version of any middleware that also exists infaraday_middleware
.