From 4969108eca0c15cffa441fb1b3b8490361b842b1 Mon Sep 17 00:00:00 2001 From: John Keiser Date: Wed, 20 Jul 2016 08:40:16 -0700 Subject: [PATCH] Constrain JSON to < 2.0 so we can test on ruby 1.9 --- Gemfile | 2 ++ Gemfile.lock | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 093f773..3231675 100644 --- a/Gemfile +++ b/Gemfile @@ -10,4 +10,6 @@ group :test do gem "coveralls", "~>0.8", require: false gem "simplecov", "~>0.10", require: false gem "codeclimate-test-reporter", "~>0.4" + # JSON 2.0.1 is ruby 2.0+ + gem "json", "< 2.0" end diff --git a/Gemfile.lock b/Gemfile.lock index cfbaf45..2b9e283 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,7 +37,7 @@ GEM oauth2 (~> 1.0.0) hashie (3.4.4) iniparse (1.4.2) - json (2.0.1) + json (1.8.3) jwt (1.5.4) multi_json (1.12.1) multi_xml (0.5.5) @@ -97,6 +97,7 @@ DEPENDENCIES codeclimate-test-reporter (~> 0.4) coveralls (~> 0.8) github_changelog_generator! + json (< 2.0) overcommit rake rspec (>= 3.2)