Merge branch 'yb-update-oauth2-to-1-1' of https://github.com/sutori/omniauth-oauth2 into sutori-yb-update-oauth2-to-1-1

Author: tmilewski

.rubocop.yml

@@ -41,5 +41,12 @@ Style/StderrPuts:
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
+<<<<<<< HEAD
 Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: 'comma'
+=======
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: comma
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: comma
+>>>>>>> f9a8a5eea4c3445c435bc84a819593f78aad9064

Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "rake"
+gem "rake", "~> 10.5"
 
 group :test do
   gem "coveralls"
@@ -9,9 +9,10 @@ group :test do
   gem "rack-test"
   gem "rest-client", "~> 1.7.3", :platforms => %i[jruby ruby_18]
   gem "rspec", "~> 3.2"
-  gem "rubocop", ">= 0.51", :platforms => %i[ruby_19 ruby_20 ruby_21 ruby_22]
+  gem "rubocop", ">= 0.51", :platforms => %i[ruby_19 ruby_20 ruby_21 ruby_22, :ruby_23, :ruby_24]
   gem "simplecov", ">= 0.9"
-  gem "webmock"
+  gem "webmock", "~> 1.0"
+  gem "addressable", "~> 2.3.8", :platforms => [:jruby, :ruby_18]
 end
 
 # Specify your gem's dependencies in omniauth-oauth2.gemspec

omniauth-oauth2.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "omniauth-oauth2/version"
 
 Gem::Specification.new do |gem|
-  gem.add_dependency "oauth2",     "~> 1.0"
+  gem.add_dependency "oauth2",     "~> 1.1"
   gem.add_dependency "omniauth",   "~> 1.2"
 
   gem.add_development_dependency "bundler", "~> 1.0"