Merge pull request #814 from samvera/softer_faraday_lock

Use a softer Faraday lock
samvera · Jan 9, 2020 · 1a6d62a · 1a6d62a
2 parents 3e3b544 + b5ff5ca
commit 1a6d62a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/valkyrie/id.rb b/lib/valkyrie/id.rb
@@ -28,8 +28,10 @@ def default_equality(other)
         output = (other.class == self.class && other.state == state)
         return output if output == true
         if output == false && string_equality(other) && Valkyrie.config.id_string_equality.nil?
+          # :nocov:
           warn "[DEPRECATION] Valkyrie::IDs will always be equal to their string counterparts in 3.0.0. " \
             "To silence this message, please either compare IDs or set Valkyrie.config.id_string_equality = true."
+          # :nocov:
         end
         false
       end

diff --git a/valkyrie.gemspec b/valkyrie.gemspec
@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json'
   spec.add_dependency 'rdf-vocab'
   spec.add_dependency 'disposable', '~> 0.4.5'
-  spec.add_dependency 'faraday', '~> 0.17'
+  spec.add_dependency 'faraday', '< 1.0'
 
   spec.add_development_dependency "bundler", "> 1.16.0", "< 3"
   spec.add_development_dependency "rake", "~> 10.0"