So many versions!!

diff --git a/lib/google/api_client.rb b/lib/google/api_client.rb
index dc9c8537904e8f536f3be1fec412ff1c55641840..91b405150a5dfdddec093621d78f94e3f1d34791 100644 (file)
--- a/lib/google/api_client.rb
+++ b/lib/google/api_client.rb
@@ -687,6 +687,4 @@ module Google
 
   end
 
-end
-
-require 'google/api_client/version'
+end
\ No newline at end of file

diff --git a/lib/google/api_client/version.rb b/lib/google/api_client/version.rb
index a979647d9a7a8a8c6a86d5cbd01e666a6833ecd3..ee12fd33b04e3e2740632a8bba66004dca4e7aea 100644 (file)
--- a/lib/google/api_client/version.rb
+++ b/lib/google/api_client/version.rb
@@ -13,19 +13,14 @@
 # limitations under the License.
 
 
-# Used to prevent the class/module from being loaded more than once
-if !defined?(::Google::APIClient::VERSION)
-
-
-  module Google
-    class APIClient
-      module VERSION
-        MAJOR = 0
-        MINOR = 7
-        TINY  = 1
-        PATCH = nil
-        STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
-      end
+module Google
+  class APIClient
+    module VERSION
+      MAJOR = 0
+      MINOR = 7
+      TINY  = 1
+      PATCH = nil
+      STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
     end
   end
 end

diff --git a/spec/google/api_client/batch_spec.rb b/spec/google/api_client/batch_spec.rb
index 0df184e56f6625532ec0c1e305fc0856062497b6..786c16a77737620e931e3d0e1621af7bc6bfed4a 100644 (file)
--- a/spec/google/api_client/batch_spec.rb
+++ b/spec/google/api_client/batch_spec.rb
@@ -14,7 +14,6 @@
 
 require 'spec_helper'
 require 'google/api_client'
-require 'google/api_client/version'
 
 describe Google::APIClient::BatchRequest do
   CLIENT = Google::APIClient.new(:application_name => 'API Client Tests') unless defined?(CLIENT)

diff --git a/spec/google/api_client/discovery_spec.rb b/spec/google/api_client/discovery_spec.rb
index 4ec5f99e5a96d9e7c2376ebe0a9590a1017f1cca..a047bab038dc1306453422fcd80f505a2ca9a80a 100644 (file)
--- a/spec/google/api_client/discovery_spec.rb
+++ b/spec/google/api_client/discovery_spec.rb
@@ -22,7 +22,6 @@ require 'multi_json'
 require 'compat/multi_json'
 require 'signet/oauth_1/client'
 require 'google/api_client'
-require 'google/api_client/version'
 
 describe Google::APIClient do
   include ConnectionHelpers

diff --git a/spec/google/api_client/gzip_spec.rb b/spec/google/api_client/gzip_spec.rb
index 36d7fd6ca082bf5c1001e9caf2c07c9d63c69c7d..e05e907370581ecdc93b3d5f24ba9f0ed48955f1 100644 (file)
--- a/spec/google/api_client/gzip_spec.rb
+++ b/spec/google/api_client/gzip_spec.rb
@@ -15,7 +15,6 @@
 require 'spec_helper'
 
 require 'google/api_client'
-require 'google/api_client/version'
 
 describe Google::APIClient::Gzip do
 

diff --git a/spec/google/api_client/media_spec.rb b/spec/google/api_client/media_spec.rb
index 8c6515ea596175b0277561be923614ad6e6560a4..0fce150f55a136e89d430111cc8a54fa68a9d6e1 100644 (file)
--- a/spec/google/api_client/media_spec.rb
+++ b/spec/google/api_client/media_spec.rb
@@ -15,7 +15,6 @@
 require 'spec_helper'
 
 require 'google/api_client'
-require 'google/api_client/version'
 
 fixtures_path = File.expand_path('../../../fixtures', __FILE__)
 

diff --git a/spec/google/api_client/request_spec.rb b/spec/google/api_client/request_spec.rb
index d70e217e3a5ac2caad753d241bfe611f91880400..760a8a34b08369eb2e0ef1634e0c68c18e5d950a 100644 (file)
--- a/spec/google/api_client/request_spec.rb
+++ b/spec/google/api_client/request_spec.rb
@@ -15,7 +15,6 @@
 require 'spec_helper'
 
 require 'google/api_client'
-require 'google/api_client/version'
 
 describe Google::APIClient::Request do
   CLIENT = Google::APIClient.new(:application_name => 'API Client Tests') unless defined?(CLIENT)

diff --git a/spec/google/api_client/result_spec.rb b/spec/google/api_client/result_spec.rb
index 757730386a8541dbcf71868bb909397d046bc534..8c5f09bc965b902181ccb9d93d24985011a3fb6c 100644 (file)
--- a/spec/google/api_client/result_spec.rb
+++ b/spec/google/api_client/result_spec.rb
@@ -15,7 +15,6 @@
 require 'spec_helper'
 
 require 'google/api_client'
-require 'google/api_client/version'
 
 describe Google::APIClient::Result do
   CLIENT = Google::APIClient.new(:application_name => 'API Client Tests') unless defined?(CLIENT)