fix(generator): Remove temporary discovery patch (#19972)

Author: dazuma

google-apis-generator/google-apis-generator.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "activesupport", ">= 5.0"
   gem.add_runtime_dependency "gems", "~> 1.2"
   gem.add_runtime_dependency "google-apis-core", ">= 0.15.0", "< 2.a"
-  gem.add_runtime_dependency "google-apis-discovery_v1", "~> 0.14"
+  gem.add_runtime_dependency "google-apis-discovery_v1", "~> 0.18"
   gem.add_runtime_dependency "thor", ">= 0.20", "< 2.a"
 end

google-apis-generator/lib/google/apis/generator.rb

@@ -18,7 +18,6 @@
 require 'google/apis/generator/template'
 require 'google/apis/generator/updater'
 require 'google/apis/generator/version'
-require 'google/apis/generator/patch'
 require 'active_support'
 require 'active_support/core_ext'
 require 'active_support/inflector'

google-apis-generator/lib/google/apis/generator/patch.rb

@@ -103,7 +103,7 @@ def <%= api_method.generated_name %>(<% for param in api_method.required_paramet
 <% for param in api.parameters.values.reject {|p| p.name == 'key'} -%>
   command.query['<%= param.name %>'] = <%= param.generated_name %> unless <%= param.generated_name %>.nil?
 <% end -%>
-<% unless api_method.api_version.empty? -%>
+<% unless api_method.api_version.to_s.empty? -%>
   command.set_api_version_header "<%= api_method.api_version %>"
 <% end -%>
   execute_or_queue_command(command, &block)