From b14178ed3abb38af96dd896087b4b9e2a28e24f8 Mon Sep 17 00:00:00 2001
From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Mon, 30 Sep 2019 11:10:08 -0400
Subject: [PATCH] Fix incompatibility with faraday 0.6.2

---
 lib/google/api_client.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/google/api_client.rb b/lib/google/api_client.rb
index 240b1037fb..b2fa0b3c44 100644
--- a/lib/google/api_client.rb
+++ b/lib/google/api_client.rb
@@ -135,7 +135,13 @@ module Google
         faraday.options.params_encoder = Faraday::FlatParamsEncoder
         faraday.ssl.ca_file = ca_file
         faraday.ssl.verify = true
-        faraday.proxy proxy
+        if faraday.respond_to?(:proxy=)
+          # faraday >= 0.6.2
+          faraday.proxy = proxy
+        else
+          # older versions of faraday
+          faraday.proxy proxy
+        end
         faraday.adapter Faraday.default_adapter
         if options[:faraday_option].is_a?(Hash)
           options[:faraday_option].each_pair do |option, value|
-- 
2.30.2