json 1.8.2 adds support ruby 2.2.

Excon depends on json via the rdoc dependency. We need to add an direct dependency on json since the rdoc dependency for json (~> 1.4) doesn't enforce 1.8.2. See: flori/json#229
jrafanie · Jan 27, 2015 · 96169a6 · 96169a6
1 parent e19dfcd
commit 96169a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -20,8 +20,8 @@ GEM
     i18n (0.6.0)
     jruby-openssl (0.8.8)
       bouncy-castle-java (>= 1.5.0147)
-    json (1.7.3)
-    json (1.7.3-java)
+    json (1.8.2)
+    json (1.8.2-java)
     kgio (2.9.2)
     minitest (4.7.5)
     multi_json (1.3.6)
@@ -260,6 +260,7 @@ DEPENDENCIES
   eventmachine
   excon!
   jruby-openssl
+  json (>= 1.8.2)
   open4
   rack (~> 1.6)
   rake

diff --git a/excon.gemspec b/excon.gemspec
@@ -62,6 +62,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rdoc')
   s.add_development_dependency('shindo')
   s.add_development_dependency('sinatra')
+  s.add_development_dependency('json', '>= 1.8.2')
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE