From aaae845d605f891f536bcb4afee8c19f568f6302 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Fri, 8 Sep 2017 15:04:40 -0400
Subject: [PATCH] allow json 1.x or 2.x

---
 Gemfile.lock   | 47 +++++++++++++++++++++++------------------------
 rscons.gemspec |  2 +-
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 50a494d..eb5aea7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,38 +1,37 @@
 PATH
   remote: .
   specs:
-    rscons (1.13.0)
-      json (~> 1.0)
+    rscons (1.14.0)
+      json (>= 1.8, < 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
-    json (1.8.3)
-    rake (10.4.2)
-    rdoc (4.2.0)
-      json (~> 1.4)
-    redcarpet (3.3.3)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    json (2.1.0)
+    rake (12.0.0)
+    rdoc (5.1.0)
+    redcarpet (3.4.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    simplecov (0.11.1)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.15.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    yard (0.8.7.6)
+    simplecov-html (0.10.2)
+    yard (0.9.9)
 
 PLATFORMS
   ruby
@@ -48,4 +47,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.10.6
+   1.15.4
diff --git a/rscons.gemspec b/rscons.gemspec
index 2de89b7..ef878c0 100644
--- a/rscons.gemspec
+++ b/rscons.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "json", "~> 1.0"
+  gem.add_dependency "json", ">= 1.8", "< 3.0"
 
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake"