Merge 15616c5 into c3be0f6

myfreecomm · Apr 24, 2014 · f8fddaa · f8fddaa
2 parents c3be0f6 + 15616c5
commit f8fddaa
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 30 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,58 +2,60 @@ PATH
   remote: .
   specs:
     charging-client (0.0.1)
-      multi_json (~> 1.7.1)
+      multi_json (~> 1.9.0)
       rest-client (~> 1.6.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
-    awesome_print (1.1.0)
-    coderay (1.0.9)
-    coveralls (0.6.9)
+    addressable (2.3.6)
+    awesome_print (1.2.0)
+    coderay (1.1.0)
+    coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    crack (0.4.1)
-      safe_yaml (~> 0.9.0)
-    diff-lcs (1.2.4)
-    json (1.8.0)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.2.5)
+    docile (1.1.3)
+    json (1.8.1)
     method_source (0.8.2)
-    mime-types (1.25)
-    multi_json (1.7.9)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    mime-types (2.2)
+    multi_json (1.9.2)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
     pry-nav (0.2.3)
       pry (~> 0.9.10)
-    rake (10.1.0)
-    rdoc (4.0.1)
+    rake (10.3.1)
+    rdoc (4.1.1)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    safe_yaml (0.9.7)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.6)
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
-    thor (0.18.1)
-    tins (0.9.0)
-    vcr (2.5.0)
+    rspec-mocks (2.14.6)
+    safe_yaml (1.0.3)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.5.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
+    tins (1.1.0)
+    vcr (2.9.0)
     webmock (1.9.3)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)

diff --git a/charging-client.gemspec b/charging-client.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rest-client", "~> 1.6.7"
-  spec.add_dependency "multi_json", "~> 1.7.1"
+  spec.add_dependency "multi_json", "~> 1.9.0"
 
   spec.add_development_dependency "bundler", "> 1.3.2"
   spec.add_development_dependency "rake", "~> 10.0"