Skip to content

Commit

Permalink
Allow Faraday 2.x (#181)
Browse files Browse the repository at this point in the history
  • Loading branch information
ykitamura-mdsol authored Feb 17, 2022
1 parent 7bedb4d commit 3704742
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 2 deletions.
14 changes: 13 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,22 @@ jobs:
strategy:
fail-fast: false
matrix: # https://github.com/ruby/setup-ruby/blob/master/README.md#supported-versions
ruby: [2.3, 2.4, 2.5, 2.6, 2.7, jruby-9.1, jruby-9.2]
ruby: [2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1, jruby-9.1, jruby-9.2]
gemfile:
- gemfiles/faraday_0.x.gemfile
- gemfiles/faraday_1.x.gemfile
- gemfiles/faraday_2.x.gemfile
exclude:
- ruby: 2.3
gemfile: gemfiles/faraday_2.x.gemfile
- ruby: 2.4
gemfile: gemfiles/faraday_2.x.gemfile
- ruby: 2.5
gemfile: gemfiles/faraday_2.x.gemfile
- ruby: jruby-9.1
gemfile: gemfiles/faraday_2.x.gemfile
- ruby: jruby-9.2
gemfile: gemfiles/faraday_2.x.gemfile
steps:
- name: Checkout Repository
uses: actions/checkout@v2
Expand Down
4 changes: 4 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@ end
appraise 'faraday_1.x' do
gem 'faraday', '~> 1.0'
end

appraise 'faraday_2.x' do
gem 'faraday', '~> 2.0'
end
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 0.48.0
* Allow Faraday 2.x.

# 0.47.3
* Moved CI to [GitHub Actions](https://github.com/openzipkin/zipkin-ruby/workflows).

Expand Down
18 changes: 18 additions & 0 deletions gemfiles/faraday_2.x.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "faraday", "~> 2.0"

platforms :ruby do
gem "benchmark-ips"
gem "rbtrace"
gem "byebug"
gem "simplecov", require: false
end

platforms :jruby do
gem "hermann", "~> 0.27.0"
end

gemspec path: "../"
3 changes: 2 additions & 1 deletion zipkin-tracer.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Gem::Specification.new do |s|
end
s.require_paths = ['lib']

s.add_dependency 'faraday', '>= 0.13', '< 2.0'
s.add_dependency 'faraday', '>= 0.13', '< 3.0'
s.add_dependency 'rack', '>= 1.0'
s.add_dependency 'sucker_punch', '~> 2.0'

Expand All @@ -37,5 +37,6 @@ Gem::Specification.new do |s|
s.add_development_dependency 'rake', '~> 13.0'
s.add_development_dependency 'timecop', '~> 0.8'
s.add_development_dependency 'webmock', '~> 3.0'
s.add_development_dependency 'webrick'
s.add_development_dependency 'simplecov', '~> 0.16'
end

0 comments on commit 3704742

Please sign in to comment.