Skip to content

Commit

Permalink
Update faraday to 1.0 to match hyrax 4.0 requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
sethaj authored and gkostin1966 committed Jan 12, 2024
1 parent baed402 commit ed06ef9
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 17 deletions.
37 changes: 30 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ PATH
remote: .
specs:
handle_rest (0.0.4)
faraday (~> 0.9)
faraday_middleware (~> 0.14.0)
faraday (~> 1.0)
faraday_middleware (~> 1.0)

GEM
remote: https://rubygems.org/
Expand All @@ -13,12 +13,33 @@ GEM
diff-lcs (1.5.0)
docile (1.4.0)
dotenv (2.7.6)
faraday (0.17.5)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.14.0)
faraday (>= 0.7.4, < 1.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
method_source (1.0.0)
multipart-post (2.1.1)
multipart-post (2.3.0)
parallel (1.22.1)
parser (3.1.2.0)
ast (~> 2.4.1)
Expand Down Expand Up @@ -61,6 +82,7 @@ GEM
rubocop-rspec (2.9.0)
rubocop (~> 1.19)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.5)
simplecov (0.21.2)
docile (~> 1.1)
simplecov-html (~> 0.11)
Expand All @@ -77,6 +99,7 @@ GEM

PLATFORMS
arm64-darwin-21
ruby
x86_64-linux

DEPENDENCIES
Expand Down
13 changes: 3 additions & 10 deletions handle_rest.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,9 @@ Gem::Specification.new do |s|
s.files = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
s.homepage = "https://github.com/mlibrary/handle_rest"
s.license = "APACHE2"
# Bundler could not find compatible versions for gem "faraday":
# In Gemfile:
# faraday (~> 2)
#
# hyrax (= 2.9.5) was resolved to 2.9.5, which depends on
# signet was resolved to 0.12.0, which depends on
# faraday (~> 0.9)
s.add_dependency "faraday", "~> 0.9"
# NOTE: This is the last minor release in the v0.x series, next release will be 1.0 to match Faraday v1.0 release and from then on only fixes will be applied to v0.14.x!
s.add_dependency "faraday_middleware", "~> 0.14.0"

s.add_dependency "faraday", "~> 1.0"
s.add_dependency "faraday_middleware", "~> 1.0"
s.required_ruby_version = ">= 2.6"

s.add_development_dependency "bundler"
Expand Down

0 comments on commit ed06ef9

Please sign in to comment.