diff --git a/CHANGELOG.md b/CHANGELOG.md index 66eaea96..c5abdbe3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ +1.7.2 +----- +* [Renamed Jrjackson adapter to JrJackson](https://github.com/intridea/multi_json/commit/b36dc915fc0e6548cbad06b5db6f520e040c9c8b) +* [Implemented jrjackson -> jr_jackson alias for back-compatability](https://github.com/intridea/multi_json/commit/aa50ab8b7bb646b8b75d5d65dfeadae8248a4f10) +* [Update vendored OkJson module](https://github.com/intridea/multi_json/commit/30a3f474e17dd86a697c3fab04f468d1a4fd69d7) + 1.7.1 +----- * [Fix capitalization of JrJackson class](https://github.com/intridea/multi_json/commit/5373a5e38c647f02427a0477cb8e0e0dafad1b8d) 1.7.0 diff --git a/Gemfile b/Gemfile index 47d9014d..2ad7c523 100644 --- a/Gemfile +++ b/Gemfile @@ -13,6 +13,7 @@ platforms :ruby, :mswin, :mingw do gem 'oj', '~> 2.0', :require => nil gem 'yajl-ruby', '~> 1.0', :require => nil end + platforms :jruby do gem 'gson', '>= 0.6', :require => nil gem 'jrjackson', :require => nil diff --git a/lib/multi_json/version.rb b/lib/multi_json/version.rb index 56aabcdf..0d320033 100644 --- a/lib/multi_json/version.rb +++ b/lib/multi_json/version.rb @@ -1,3 +1,3 @@ module MultiJson - VERSION = '1.7.1' unless defined?(MultiJson::VERSION) + VERSION = '1.7.2' unless defined?(MultiJson::VERSION) end