diff --git a/Gemfile b/Gemfile index 78f9853bed19e4a0bcac86080db9488ba764ad98..ba102fe711f4b2075659b4640d5a7f92d2426cac 100644 --- a/Gemfile +++ b/Gemfile @@ -103,7 +103,6 @@ platforms :ruby, :mswin, :mswin64, :mingw, :x64_mingw do end platforms :jruby do - gem 'json' if ENV['AR_JDBC'] gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master' group :db do diff --git a/Gemfile.lock b/Gemfile.lock index bd2e2c30b98b0e116984ff3421bbd70c8470b78c..249028d697e195b245f369b56669bec000a12213 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,7 +64,6 @@ PATH activesupport (5.0.0.beta2) concurrent-ruby (~> 1.0) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) method_source minitest (~> 5.1) tzinfo (~> 1.1) @@ -287,7 +286,6 @@ DEPENDENCIES faye-websocket hiredis jquery-rails - json kindlerb (= 0.1.1) listen (~> 3.0.5) minitest (< 5.3.4) diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index 32e28c0212c7b5967a1172963b516874454fb6b8..3b71858350215e336b07ee536f0f973892ea36c3 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -21,7 +21,6 @@ s.rdoc_options.concat ['--encoding', 'UTF-8'] s.add_dependency 'i18n', '~> 0.7' - s.add_dependency 'json', '~> 1.7', '>= 1.7.7' s.add_dependency 'tzinfo', '~> 1.1' s.add_dependency 'minitest', '~> 5.1' s.add_dependency 'concurrent-ruby', '~> 1.0'