Skip to content

Commit 8089db9

Browse files
authored
Merge pull request #38 from smortex/faraday
Allow faraday 2.x
2 parents 3a1b8c6 + 900afbf commit 8089db9

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

.github/workflows/spec.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,21 @@ jobs:
99
spec:
1010
name: Spec test
1111
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
ruby:
15+
- "2.6"
16+
- "2.7"
17+
- "3.0"
18+
- "3.1"
19+
- "3.2"
1220
steps:
1321
- name: Checkout repository
14-
uses: actions/checkout@v2
22+
uses: actions/checkout@v4
1523
- name: Setup Ruby
1624
uses: ruby/setup-ruby@v1
1725
with:
18-
ruby-version: 2.7
26+
ruby-version: ${{ matrix.ruby }}
1927
bundler-cache: true
2028
- name: Update gems
2129
run: bundle update

lib/orchestrator_client.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
require 'json'
44
require 'openssl'
55
require 'faraday'
6+
require 'faraday/net_http_persistent'
67

78
class OrchestratorClient
89
require 'orchestrator_client/error'

orchestrator_client.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ Gem::Specification.new do |s|
1515
s.license = "Apache-2.0"
1616
s.require_paths = ["lib"]
1717

18-
s.add_dependency 'faraday', '~> 1.4'
19-
s.add_dependency 'net-http-persistent', '~> 4.0'
18+
s.add_dependency 'faraday', '>= 1.4', '< 3.0'
19+
s.add_dependency 'faraday-net_http_persistent', '>= 1.0', '< 3.0'
2020
end

0 commit comments

Comments
 (0)