aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorAndrew White <andrew.white@unboxed.co>2016-11-02 10:10:27 +0000
committerAndrew White <andrew.white@unboxed.co>2016-11-02 10:10:27 +0000
commite61a279c2b73cb5ac7c9a18b2ff1b8a5a853c16f (patch)
treef015b31e7f8f86430822e1974bccfb45d53a1878 /Gemfile
parent135e6fb23b0818ba5173f166edeb813685e0f26e (diff)
downloadrails-e61a279c2b73cb5ac7c9a18b2ff1b8a5a853c16f.tar.gz
rails-e61a279c2b73cb5ac7c9a18b2ff1b8a5a853c16f.tar.bz2
rails-e61a279c2b73cb5ac7c9a18b2ff1b8a5a853c16f.zip
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.
Diffstat (limited to 'Gemfile')
-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