Skip to content

Commit 81b2924

Browse files
rosstathde
authored andcommitted
Make root Gemfile compatible with Faraday 2 support
The root Gemfile and Gemfile.lock is updated to use the latest version of Faraday 1.x.
1 parent 7675269 commit 81b2924

File tree

3 files changed

+23
-19
lines changed

3 files changed

+23
-19
lines changed

.github/workflows/rspec.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@ jobs:
1717
# Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
1818
ruby: ['2.7', '3.0', '3.1', '3.2']
1919
gemfile:
20-
['gemfiles/faraday0.gemfile', 'gemfiles/faraday1.gemfile', 'gemfiles/faraday2.gemfile']
20+
[
21+
'Gemfile',
22+
'gemfiles/faraday0.gemfile',
23+
'gemfiles/faraday1.gemfile',
24+
'gemfiles/faraday2.gemfile',
25+
]
2126
# Faraday 0.x with Ruby 3.x not supported
2227
exclude:
2328
- ruby: '3.0'

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
source 'https://rubygems.org'
22

3+
gem "faraday", "~> 1.10"
4+
gem "faraday_middleware"
5+
36
# Specify your gem dependencies in netbox-client-ruby.gemspec
47
gemspec

Gemfile.lock

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,22 @@ GEM
1414
ast (2.4.2)
1515
coderay (1.1.3)
1616
concurrent-ruby (1.2.2)
17-
connection_pool (2.4.1)
1817
diff-lcs (1.5.0)
1918
dry-configurable (1.0.1)
2019
dry-core (~> 1.0, < 2)
2120
zeitwerk (~> 2.6)
2221
dry-core (1.0.0)
2322
concurrent-ruby (~> 1.0)
2423
zeitwerk (~> 2.6)
25-
faraday (1.9.0)
24+
faraday (1.10.3)
2625
faraday-em_http (~> 1.0)
2726
faraday-em_synchrony (~> 1.0)
2827
faraday-excon (~> 1.1)
29-
faraday-httpclient (< 3)
28+
faraday-httpclient (~> 1.0)
3029
faraday-multipart (~> 1.0)
31-
faraday-net_http (< 3)
32-
faraday-net_http_persistent (< 3)
33-
faraday-patron (< 3)
30+
faraday-net_http (~> 1.0)
31+
faraday-net_http_persistent (~> 1.0)
32+
faraday-patron (~> 1.0)
3433
faraday-rack (~> 1.0)
3534
faraday-retry (~> 1.0)
3635
ruby2_keywords (>= 0.0.4)
@@ -39,30 +38,24 @@ GEM
3938
faraday-em_http (1.0.0)
4039
faraday-em_synchrony (1.0.0)
4140
faraday-excon (1.1.0)
42-
faraday-httpclient (2.0.1)
43-
httpclient (>= 2.2)
41+
faraday-httpclient (1.0.1)
4442
faraday-multipart (1.0.4)
4543
multipart-post (~> 2)
46-
faraday-net_http (2.1.0)
47-
faraday-net_http_persistent (2.0.2)
48-
faraday-net_http (< 3)
49-
net-http-persistent (~> 4.0)
50-
faraday-patron (2.0.1)
51-
patron (>= 0.4.2)
44+
faraday-net_http (1.0.1)
45+
faraday-net_http_persistent (1.2.0)
46+
faraday-patron (1.0.0)
5247
faraday-rack (1.0.0)
5348
faraday-retry (1.0.3)
54-
httpclient (2.8.3)
49+
faraday_middleware (1.2.0)
50+
faraday (~> 1.0)
5551
ipaddress (0.8.3)
5652
method_source (1.0.0)
5753
multipart-post (2.3.0)
58-
net-http-persistent (4.0.2)
59-
connection_pool (~> 2.2)
6054
openssl (3.2.0)
6155
parallel (1.23.0)
6256
parser (3.2.2.3)
6357
ast (~> 2.4.1)
6458
racc
65-
patron (0.13.3)
6659
pry (0.14.2)
6760
coderay (~> 1.1)
6861
method_source (~> 1.0)
@@ -105,9 +98,12 @@ GEM
10598

10699
PLATFORMS
107100
arm64-darwin-22
101+
x86_64-linux
108102

109103
DEPENDENCIES
110104
bundler (~> 2.1)
105+
faraday (~> 1.10)
106+
faraday_middleware
111107
netbox-client-ruby!
112108
pry (~> 0.10)
113109
rake (~> 13)

0 commit comments

Comments
 (0)