From e61a279c2b73cb5ac7c9a18b2ff1b8a5a853c16f Mon Sep 17 00:00:00 2001 From: Andrew White Date: Wed, 2 Nov 2016 10:10:27 +0000 Subject: Only list json gem once in Gemfile Bundler gives a warning if you have a gem listed more than once in your Gemfile. Even though they were in different platform blocks it's better to combine them in case it causes a problem later. --- Gemfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 9507e19716..e22d594848 100644 --- a/Gemfile +++ b/Gemfile @@ -68,7 +68,6 @@ gem 'memcache-client', '>= 1.8.5' platforms :mri_18 do gem 'system_timer' - gem 'json' end # Add your own local bundler stuff @@ -99,7 +98,6 @@ platforms :ruby do end platforms :jruby do - gem 'json' gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2.7' # This is needed by now to let tests work on JRuby @@ -113,6 +111,10 @@ platforms :jruby do end end +platforms :mri_18, :jruby do + gem 'json' +end + # gems that are necessary for ActiveRecord tests with Oracle database if ENV['ORACLE_ENHANCED_PATH'] || ENV['ORACLE_ENHANCED'] platforms :ruby do -- cgit v1.2.3