summaryrefslogtreecommitdiff
path: root/ext/json/lib
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2020-12-22 18:18:32 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2020-12-22 19:44:27 +0900
commitedb76e8765b7f165237c8ca6155cff1cc0f18cf9 (patch)
tree83f4ed70e245a6ee67b64e4b48bd9632691d3bad /ext/json/lib
parentf2f00e24fa14b8114d6c3bea11170b2b3e309719 (diff)
Prepare to release json-2.5.0
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3975
Diffstat (limited to 'ext/json/lib')
-rw-r--r--ext/json/lib/json/common.rb1
-rw-r--r--ext/json/lib/json/version.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb
index d58c7eae907..3e390f2d6b6 100644
--- a/ext/json/lib/json/common.rb
+++ b/ext/json/lib/json/common.rb
@@ -71,6 +71,7 @@ module JSON
end
self.state = generator::State
const_set :State, self.state
+ const_set :SAFE_STATE_PROTOTYPE, State.new # for JRuby
ensure
$VERBOSE = old
end
diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb
index 5502a4d273c..2a0a6e8e555 100644
--- a/ext/json/lib/json/version.rb
+++ b/ext/json/lib/json/version.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: false
module JSON
# JSON version
- VERSION = '2.4.1'
+ VERSION = '2.5.0'
VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: