Updated rdoc to get rid of json 1.7 gem problems

See ruby/json#229
technicalpanda · Jan 13, 2017 · 92e592c · 92e592c
1 parent e9fa8e1
commit 92e592c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -9,7 +9,7 @@ gem 'symbolize', '~> 4.2'
 group :development do
   # gem 'debugger'
   gem 'rspec', '~> 3.1'
-  gem 'rdoc', '~> 3.12'
+  gem 'rdoc', '~> 4.2'
   gem 'bundler', '~> 1.6'
   gem 'jeweler', '~> 2.0'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -38,8 +38,6 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.7.7)
-    json (1.7.7-java)
     jwt (1.2.0)
     mini_portile (0.6.2)
     minitest (4.6.1)
@@ -57,8 +55,7 @@ GEM
       rack (~> 1.2)
     rack (1.6.0)
     rake (10.4.2)
-    rdoc (3.12.1)
-      json (~> 1.4)
+    rdoc (4.3.0)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -86,6 +83,9 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.6)
   jeweler (~> 2.0)
-  rdoc (~> 3.12)
+  rdoc (~> 4.2)
   rspec (~> 3.1)
   symbolize (~> 4.2)
+
+BUNDLED WITH
+   1.13.6