So many versions!!

dominiclovell · Oct 8, 2014 · 39c3e81 · 39c3e81
1 parent e313235
commit 39c3e81
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 22 deletions.
diff --git a/lib/google/api_client.rb b/lib/google/api_client.rb
@@ -687,6 +687,4 @@ def client_error_handler(authorization)
 
   end
 
-end
-
-require 'google/api_client/version'
+end
diff --git 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
@@ -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
@@ -22,7 +22,6 @@
 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
@@ -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
@@ -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
@@ -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
@@ -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)
-Original file line number
+Diff line change
@@ Expand Up / @@ -687,6 +687,4 @@ def client_error_handler(authorization) @@
       end
-    end
-    require 'google/api_client/version'
+    end