Skip to content

Commit

Permalink
Make root Gemfile compatible with Faraday 2 support
Browse files Browse the repository at this point in the history
The root Gemfile and Gemfile.lock is updated to use the latest
version of Faraday 1.x.
  • Loading branch information
rossta authored and thde committed Sep 29, 2023
1 parent 7675269 commit 81b2924
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 19 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/rspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ jobs:
# Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
ruby: ['2.7', '3.0', '3.1', '3.2']
gemfile:
['gemfiles/faraday0.gemfile', 'gemfiles/faraday1.gemfile', 'gemfiles/faraday2.gemfile']
[
'Gemfile',
'gemfiles/faraday0.gemfile',
'gemfiles/faraday1.gemfile',
'gemfiles/faraday2.gemfile',
]
# Faraday 0.x with Ruby 3.x not supported
exclude:
- ruby: '3.0'
Expand Down
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
source 'https://rubygems.org'

gem "faraday", "~> 1.10"
gem "faraday_middleware"

# Specify your gem dependencies in netbox-client-ruby.gemspec
gemspec
32 changes: 14 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,22 @@ GEM
ast (2.4.2)
coderay (1.1.3)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
diff-lcs (1.5.0)
dry-configurable (1.0.1)
dry-core (~> 1.0, < 2)
zeitwerk (~> 2.6)
dry-core (1.0.0)
concurrent-ruby (~> 1.0)
zeitwerk (~> 2.6)
faraday (1.9.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (< 3)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (< 3)
faraday-net_http_persistent (< 3)
faraday-patron (< 3)
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)
Expand All @@ -39,30 +38,24 @@ GEM
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (2.0.1)
httpclient (>= 2.2)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (2.1.0)
faraday-net_http_persistent (2.0.2)
faraday-net_http (< 3)
net-http-persistent (~> 4.0)
faraday-patron (2.0.1)
patron (>= 0.4.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)
httpclient (2.8.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
ipaddress (0.8.3)
method_source (1.0.0)
multipart-post (2.3.0)
net-http-persistent (4.0.2)
connection_pool (~> 2.2)
openssl (3.2.0)
parallel (1.23.0)
parser (3.2.2.3)
ast (~> 2.4.1)
racc
patron (0.13.3)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
Expand Down Expand Up @@ -105,9 +98,12 @@ GEM

PLATFORMS
arm64-darwin-22
x86_64-linux

DEPENDENCIES
bundler (~> 2.1)
faraday (~> 1.10)
faraday_middleware
netbox-client-ruby!
pry (~> 0.10)
rake (~> 13)
Expand Down

0 comments on commit 81b2924

Please sign in to comment.