From fd295849b9409da87db170d60ccd3fed2bcb674c Mon Sep 17 00:00:00 2001
From: Steve Bazyl <sbazyl@google.com>
Date: Thu, 18 Aug 2016 10:07:19 -0700
Subject: [PATCH] Bump version to lock activesupport dependency, update tests
 to not use old APIs

---
 CHANGELOG.md                             | 3 +++
 google-api-client.gemspec                | 2 +-
 lib/google/api_client/version.rb         | 2 +-
 spec/google/api_client/discovery_spec.rb | 2 +-
 spec/google/api_client/media_spec.rb     | 2 +-
 spec/google/api_client/service_spec.rb   | 6 +++---
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff7d056781..9d11caf68b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 0.8.7
+* Lock activesupport version to < 5.0
+
 # 0.8.6
 * Use discovered 'rootUrl' as base URI for services
 * Respect discovered methods with colons in path
diff --git a/google-api-client.gemspec b/google-api-client.gemspec
index b69b571a2c..e5e3498058 100644
--- a/google-api-client.gemspec
+++ b/google-api-client.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'extlib', '~> 0.9'
   s.add_runtime_dependency 'launchy', '~> 2.4'
   s.add_runtime_dependency 'retriable', '~> 1.4'
-  s.add_runtime_dependency 'activesupport', '>= 3.2'
+  s.add_runtime_dependency 'activesupport', '>= 3.2', '< 5.0'
 
   s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'yard', '~> 0.8'
diff --git a/lib/google/api_client/version.rb b/lib/google/api_client/version.rb
index 18d4ec22c1..edddd808b2 100644
--- a/lib/google/api_client/version.rb
+++ b/lib/google/api_client/version.rb
@@ -18,7 +18,7 @@ module Google
     module VERSION
       MAJOR = 0
       MINOR = 8
-      TINY  = 6
+      TINY  = 7
       PATCH = nil
       STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
     end
diff --git a/spec/google/api_client/discovery_spec.rb b/spec/google/api_client/discovery_spec.rb
index 637d25e9f1..d596538cca 100644
--- a/spec/google/api_client/discovery_spec.rb
+++ b/spec/google/api_client/discovery_spec.rb
@@ -644,7 +644,7 @@ RSpec.describe Google::APIClient do
   describe 'with the Drive API' do
     before do
       CLIENT.authorization = nil
-      @drive = CLIENT.discovered_api('drive', 'v1')
+      @drive = CLIENT.discovered_api('drive', 'v2')
     end
 
     it 'should include media upload info methods' do
diff --git a/spec/google/api_client/media_spec.rb b/spec/google/api_client/media_spec.rb
index f32b31efc0..944981b187 100644
--- a/spec/google/api_client/media_spec.rb
+++ b/spec/google/api_client/media_spec.rb
@@ -114,7 +114,7 @@ RSpec.describe Google::APIClient::ResumableUpload do
   end
 
   before do
-    @drive = CLIENT.discovered_api('drive', 'v1')
+    @drive = CLIENT.discovered_api('drive', 'v2')
     @file = File.expand_path('files/sample.txt', fixtures_path)
     @media = Google::APIClient::UploadIO.new(@file, 'text/plain')
     @uploader = Google::APIClient::ResumableUpload.new(
diff --git a/spec/google/api_client/service_spec.rb b/spec/google/api_client/service_spec.rb
index a6f6925e58..fbbdd53ee9 100644
--- a/spec/google/api_client/service_spec.rb
+++ b/spec/google/api_client/service_spec.rb
@@ -227,14 +227,14 @@ RSpec.describe Google::APIClient::Service do
 
     it 'should make a valid call with an object body and media upload' do
       conn = stub_connection do |stub|
-        stub.post('/upload/drive/v1/files?uploadType=multipart') do |env|
+        stub.post('/upload/drive/v2/files?uploadType=multipart') do |env|
           expect(env.body).to be_a Faraday::CompositeReadIO
           [200, {}, '{}']
         end
       end
       drive = Google::APIClient::Service.new(
         'drive',
-        'v1',
+        'v2',
         {
           :application_name => APPLICATION_NAME,
           :authenticated => false,
@@ -248,7 +248,7 @@ RSpec.describe Google::APIClient::Service do
 
     describe 'with no connection' do
       before do
-        @drive = Google::APIClient::Service.new('drive', 'v1',
+        @drive = Google::APIClient::Service.new('drive', 'v2',
           {:application_name => APPLICATION_NAME, :cache_store => nil})
       end
 
-- 
2.30.2