Skip to content

Bump faraday version to 0.15+ #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 22, 2018
Merged

Bump faraday version to 0.15+ #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2963fa1
Bump faraday version to 0.15+
raimondasv Jul 9, 2018
b3edbbc
Remove gem dependencies in jruby_1_7.gemfile
raimondasv Jul 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions gemfiles/jruby_1.7.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
source 'https://rubygems.org'

gem 'faraday', '~> 0.9.2'
gem 'jwt', '< 1.5.2'
gem 'mime-types', '~> 1.25'
gem 'rack', '~> 1.2'
gem 'rest-client', '~> 1.6.0'

group :test do
# Some changes to defaults make older version config incompatible with newer version config
# gem "rubocop", "~> 0.41.2"
Expand Down
2 changes: 1 addition & 1 deletion oauth2.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require 'oauth2/version'

Gem::Specification.new do |spec|
spec.add_dependency 'faraday', ['>= 0.8', '< 0.15.0']
spec.add_dependency 'faraday', ['>= 0.8', '< 0.16.0']
spec.add_dependency 'jwt', ['>= 1.0', '< 3.0']
spec.add_dependency 'multi_json', '~> 1.3'
spec.add_dependency 'multi_xml', '~> 0.5'
Expand Down
2 changes: 1 addition & 1 deletion spec/oauth2/client_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
subject.request(:get, '/success')
end

expect(output).to include 'INFO -- : get https://api.example.com/success', 'INFO -- : get https://api.example.com/success'
expect(output).to include 'INFO -- request: GET https://api.example.com/success'
end
end

Expand Down