From bb9f607c8e81ded7555d64bd6b4ae49f99142dc1 Mon Sep 17 00:00:00 2001
From: tomykaira <tomykaira@gmail.com>
Date: Sat, 27 Sep 2014 22:01:33 +0900
Subject: [PATCH] Use retriable 1.x

Retriable version 2.0.0.beta is now released and its API changed.
Google-api-client does not work with the new API.
As a quick fix, specify retriable version in '>= 1.4 < 2.0'
---
 Gemfile                   | 2 +-
 google-api-client.gemspec | 6 +++---
 tasks/gem.rake            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index ee8f34b52..a0da71a31 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ gem 'faraday', '>= 0.9.0'
 gem 'multi_json', '>= 1.0.0'
 gem 'extlib', '>= 0.9.15'
 gem 'jwt', '~> 0.1.5'
-gem 'retriable', '>= 1.4'
+gem 'retriable', '~> 1.4'
 gem 'jruby-openssl', :platforms => :jruby
 
 group :development do
diff --git a/google-api-client.gemspec b/google-api-client.gemspec
index a68db27e8..9246d9013 100644
--- a/google-api-client.gemspec
+++ b/google-api-client.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<multi_json>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<extlib>, [">= 0.9.15"])
       s.add_runtime_dependency(%q<jwt>, [">= 0.1.5"])
-      s.add_runtime_dependency(%q<retriable>, [">= 1.4"])
+      s.add_runtime_dependency(%q<retriable>, ["~> 1.4"])
       s.add_runtime_dependency(%q<launchy>, [">= 2.1.1"])
       s.add_development_dependency(%q<rake>, [">= 0.9.0"])
       s.add_development_dependency(%q<rspec>, [">= 2.11.0"])
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<multi_json>, [">= 1.0.0"])
       s.add_dependency(%q<extlib>, [">= 0.9.15"])
       s.add_dependency(%q<jwt>, [">= 0.1.5"])
-      s.add_dependency(%q<retriable>, [">= 1.4"])
+      s.add_dependency(%q<retriable>, ["~> 1.4"])
       s.add_dependency(%q<launchy>, [">= 2.1.1"])
       s.add_dependency(%q<rake>, [">= 0.9.0"])
       s.add_dependency(%q<rspec>, [">= 2.11.0"])
@@ -57,7 +57,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<multi_json>, [">= 1.0.0"])
     s.add_dependency(%q<extlib>, [">= 0.9.15"])
     s.add_dependency(%q<jwt>, [">= 0.1.5"])
-    s.add_dependency(%q<retriable>, [">= 1.4"])
+    s.add_dependency(%q<retriable>, ["~> 1.4"])
     s.add_dependency(%q<launchy>, [">= 2.1.1"])
     s.add_dependency(%q<rake>, [">= 0.9.0"])
     s.add_dependency(%q<rspec>, [">= 2.11.0"])
diff --git a/tasks/gem.rake b/tasks/gem.rake
index 4e401cd50..6a714a9d0 100644
--- a/tasks/gem.rake
+++ b/tasks/gem.rake
@@ -31,7 +31,7 @@ namespace :gem do
     s.add_runtime_dependency('multi_json', '>= 1.0.0')
     s.add_runtime_dependency('extlib', '>= 0.9.15')
     s.add_runtime_dependency('jwt', '>= 0.1.5')
-    s.add_runtime_dependency('retriable', '>= 1.4')
+    s.add_runtime_dependency('retriable', '~> 1.4')
     # Dependencies used in the CLI
     s.add_runtime_dependency('launchy', '>= 2.1.1')