From 2963fa1cc202ef7a1ee3ac211baab710eee5aee7 Mon Sep 17 00:00:00 2001 From: Raimondas Valickas Date: Mon, 9 Jul 2018 21:30:02 +0300 Subject: [PATCH 1/2] Bump faraday version to 0.15+ --- oauth2.gemspec | 2 +- spec/oauth2/client_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oauth2.gemspec b/oauth2.gemspec index 96bbbce2..ef441a4b 100644 --- a/oauth2.gemspec +++ b/oauth2.gemspec @@ -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' diff --git a/spec/oauth2/client_spec.rb b/spec/oauth2/client_spec.rb index 5ca6259e..3afda0c4 100644 --- a/spec/oauth2/client_spec.rb +++ b/spec/oauth2/client_spec.rb @@ -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 From b3edbbc2b71c444e88321b1c9f229a99d2c6772e Mon Sep 17 00:00:00 2001 From: Raimondas Valickas Date: Mon, 9 Jul 2018 22:12:44 +0300 Subject: [PATCH 2/2] Remove gem dependencies in jruby_1_7.gemfile --- gemfiles/jruby_1.7.gemfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gemfiles/jruby_1.7.gemfile b/gemfiles/jruby_1.7.gemfile index f31532b0..3c71357a 100644 --- a/gemfiles/jruby_1.7.gemfile +++ b/gemfiles/jruby_1.7.gemfile @@ -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"