diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-12-22 21:51:15 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-12-22 21:51:15 +0900 |
commit | 034c19ce288b951cfaf3bbd996ce19e14fdeb502 (patch) | |
tree | aef4115453fce86ed80d5b13f5d5cdcf8e747547 /ext | |
parent | 9b9cbbbc17bb5840581c7da37fd0feb0a7d4c1f3 (diff) |
Merge json-2.5.1
Diffstat (limited to 'ext')
-rw-r--r-- | ext/json/VERSION | 2 | ||||
-rw-r--r-- | ext/json/lib/json/common.rb | 2 | ||||
-rw-r--r-- | ext/json/lib/json/version.rb | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/ext/json/VERSION b/ext/json/VERSION index 437459cd94..73462a5a13 100644 --- a/ext/json/VERSION +++ b/ext/json/VERSION @@ -1 +1 @@ -2.5.0 +2.5.1 diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb index 3e390f2d6b..ea46896fcc 100644 --- a/ext/json/lib/json/common.rb +++ b/ext/json/lib/json/common.rb @@ -72,6 +72,8 @@ module JSON self.state = generator::State const_set :State, self.state const_set :SAFE_STATE_PROTOTYPE, State.new # for JRuby + const_set :FAST_STATE_PROTOTYPE, create_fast_state + const_set :PRETTY_STATE_PROTOTYPE, create_pretty_state ensure $VERBOSE = old end diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb index 2a0a6e8e55..7a72272bd0 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.5.0' + VERSION = '2.5.1' VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc: VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc: VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: |