summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-05 23:40:24 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-05 23:40:24 +0000
commit1f1e3d12979fa385353b034c25d52a36e87b2ad6 (patch)
treeea48938d3ff010da418d654b160e0055158ee988
parentbf52a8b6c44a32a1e251ddc1dbb6904f4f6c6f87 (diff)
* 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
-rw-r--r--ChangeLog10
-rw-r--r--ext/json/json.gemspec2
-rw-r--r--ext/json/lib/json/version.rb2
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 759aa06e445..888a5eaa1bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Dec 6 08:39:05 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * 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 <lars@greiz-reinsdorf.de>
* 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 d756dd78edb..9fb6fa155a1 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 4549f5f2132..5a4013dbf6e 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: