aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile6
1 files changed, 4 insertions, 2 deletions
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