diff options
| author | Mike Perham <mperham@gmail.com> | 2016-02-03 10:49:14 -0800 |
|---|---|---|
| committer | Mike Perham <mperham@gmail.com> | 2016-02-03 10:49:14 -0800 |
| commit | f3433f7c757ef8352c3ea3796a9b350b4454a2b6 (patch) | |
| tree | 3dc8b714b97fc49c0b51c3dcbf8d1b3dd6c3ba13 | |
| parent | 8a84f1c047ebb59dec7a7ece9355da9c7b0ae6b7 (diff) | |
| download | rails-f3433f7c757ef8352c3ea3796a9b350b4454a2b6.tar.gz rails-f3433f7c757ef8352c3ea3796a9b350b4454a2b6.tar.bz2 rails-f3433f7c757ef8352c3ea3796a9b350b4454a2b6.zip | |
Remove json gem dependency
All modern Rubies ship JSON as part of stdlib. Using the gem actually hurts multi-platform support due to build difficulties on Windows.
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | activesupport/activesupport.gemspec | 1 |
3 files changed, 0 insertions, 4 deletions
@@ -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 bd2e2c30b9..249028d697 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 32e28c0212..3b71858350 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -21,7 +21,6 @@ Gem::Specification.new do |s| 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' |