From 1f1e3d12979fa385353b034c25d52a36e87b2ad6 Mon Sep 17 00:00:00 2001 From: hsbt Date: Sat, 5 Dec 2015 23:40:24 +0000 Subject: * ext/json/json.gemspec: bump version to json 1.8.3. CRuby already contained upstream changes. https://github.com/ruby/ruby/commit/4d059bf9f5f10f3d3088de49fc87e5555db7770d https://github.com/flori/json/commit/d4c99de78905d96c3f301f48b2c789943bb3f098 * ext/json/lib/json/version.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52899 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++++ ext/json/json.gemspec | 2 +- ext/json/lib/json/version.rb | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 759aa06e44..888a5eaa1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Sun Dec 6 08:39:05 2015 SHIBATA Hiroshi + + * ext/json/json.gemspec: bump version to json 1.8.3. CRuby already contained + upstream changes. + + https://github.com/ruby/ruby/commit/4d059bf9f5f10f3d3088de49fc87e5555db7770d + https://github.com/flori/json/commit/d4c99de78905d96c3f301f48b2c789943bb3f098 + + * ext/json/lib/json/version.rb: ditto. + Sat Dec 5 17:48:25 2015 Lars Kanis * tool/fake.rb: Fix cross build when srcdir is an absolute path. diff --git a/ext/json/json.gemspec b/ext/json/json.gemspec index d756dd78ed..9fb6fa155a 100644 --- a/ext/json/json.gemspec +++ b/ext/json/json.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "json" - s.version = "1.8.2" + s.version = "1.8.3" s.summary = "This json is bundled with Ruby" s.executables = [] s.files = ["json.rb", "json/add/bigdecimal.rb", "json/add/complex.rb", "json/add/core.rb", "json/add/date.rb", "json/add/date_time.rb", "json/add/exception.rb", "json/add/ostruct.rb", "json/add/range.rb", "json/add/rational.rb", "json/add/regexp.rb", "json/add/struct.rb", "json/add/symbol.rb", "json/add/time.rb", "json/common.rb", "json/ext.rb", "json/ext/generator.bundle", "json/ext/parser.bundle", "json/generic_object.rb", "json/version.rb"] diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb index 4549f5f213..5a4013dbf6 100644 --- a/ext/json/lib/json/version.rb +++ b/ext/json/lib/json/version.rb @@ -1,6 +1,6 @@ module JSON # JSON version - VERSION = '1.8.2' + VERSION = '1.8.3' VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc: VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc: VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: -- cgit v1.2.3