Dropped uuidtools

diff --git a/google-api-client.gemspec b/google-api-client.gemspec
index 39cea1eca5f994c7e180af3636f505a8994669a5..0a6b16ef58d8684c334081e396f061fc886bf048 100644 (file)
--- a/google-api-client.gemspec
+++ b/google-api-client.gemspec
@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('signet', '>= 0.5.0')
   s.add_runtime_dependency('addressable', '>= 2.3.2')
-  s.add_runtime_dependency('uuidtools', '>= 2.1.0')
   s.add_runtime_dependency('autoparse', '>= 0.3.3')
   s.add_runtime_dependency('faraday', '>= 0.9.0')
   s.add_runtime_dependency('multi_json', '>= 1.0.0')

diff --git a/lib/google/api_client/batch.rb b/lib/google/api_client/batch.rb
index 0a7e6b78c50e746aa5f40ab2c6e0395a1352ad17..1082516ade032ebf9f73b7c7ec1ddb30755e5093 100644 (file)
--- a/lib/google/api_client/batch.rb
+++ b/lib/google/api_client/batch.rb
@@ -14,7 +14,7 @@
 
 require 'addressable/uri'
 require 'google/api_client/reference'
-require 'uuidtools'
+require 'securerandom'
 
 module Google
   class APIClient
@@ -90,8 +90,7 @@ module Google
         @global_callback = block if block_given?
         @last_auto_id = 0
         
-        # TODO(sgomes): Use SecureRandom.uuid, drop UUIDTools when we drop 1.8
-        @base_id = UUIDTools::UUID.random_create.to_s
+        @base_id = SecureRandom.uuid
 
         options[:uri] ||= 'https://www.googleapis.com/batch'
         options[:http_method] ||= 'POST'

diff --git a/lib/google/api_client/client_secrets.rb b/lib/google/api_client/client_secrets.rb
index 0432671d42e0bff066cd87f373412a26ce0ece76..792f1b7cf2f507b0a5fef1579f5ee7a00a09d39c 100644 (file)
--- a/lib/google/api_client/client_secrets.rb
+++ b/lib/google/api_client/client_secrets.rb
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 
-require 'multi_json'
 require 'compat/multi_json'
 
 

diff --git a/lib/google/api_client/request.rb b/lib/google/api_client/request.rb
index a8a83c4a42ae87c0e7394c42d8693550cdbb273e..bfe3abab273c9d9715b966e1e66b061428cfd004 100644 (file)
--- a/lib/google/api_client/request.rb
+++ b/lib/google/api_client/request.rb
@@ -14,7 +14,6 @@
 
 require 'faraday'
 require 'faraday/request/multipart'
-require 'multi_json'
 require 'compat/multi_json'
 require 'addressable/uri'
 require 'stringio'