Fixed circular dependency warning [skip ci]

Andrew Kane
1 parent c1dcbde8
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
lib/searchkick.rb
@@ -49,7 +49,7 @@ module Searchkick
  
   def self.client
     @client ||= begin
-      require "typhoeus/adapters/faraday" if defined?(Typhoeus)
+      require "typhoeus/adapters/faraday" if defined?(Typhoeus) && Gem::Version.new(Faraday::VERSION) < Gem::Version.new("0.14.0")
  
       Elasticsearch::Client.new({
         url: ENV["ELASTICSEARCH_URL"],
...	...	@@ -49,7 +49,7 @@ module Searchkick
49	49
50	50	def self.client
51	51	@client \|\|= begin
52		- require "typhoeus/adapters/faraday" if defined?(Typhoeus)
	52	+ require "typhoeus/adapters/faraday" if defined?(Typhoeus) && Gem::Version.new(Faraday::VERSION) < Gem::Version.new("0.14.0")
53	53
54	54	Elasticsearch::Client.new({
55	55	url: ENV["ELASTICSEARCH_URL"],
...	...