Bump version to lock activesupport dependency, update tests to not use old APIs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff7d0567819da56bd721ec0076cd53e1f8534f87..9d11caf68bc669407167e61b6d2d83be9861b042 100644 (file)
--- 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 b69b571a2cbd39ac882cb4d48bcf196922dcc31f..e5e3498058881ee7d7833a63fc5500a1a0a04159 100644 (file)
--- 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 18d4ec22c1960e00dab50b3c61d226c4bff990f4..edddd808b215e8fcc15f351e2dda01df88efe833 100644 (file)
--- 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 637d25e9f1ba6903c52c26e1ad9a9c2fc524faf0..d596538cca560ad9b1c4b38cd8758a51fde45bdf 100644 (file)
--- 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 f32b31efc0e553aa8a5bded9fa31137483b92c0c..944981b187d1978ff518d4b3cad92fd483bfa982 100644 (file)
--- 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 a6f6925e58cf08865a7cc8686a96b7312a8db731..fbbdd53ee985c4bd7fc427bda93ca88a4d9d05cd 100644 (file)
--- 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