kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Prepare to release json-2.5.0

Browse source
This commit is contained in:
Hiroshi SHIBATA 2020-12-22 18:18:32 +09:00
parent f2f00e24fa
commit edb76e8765
Notes: git 2020-12-22 19:44:53 +09:00
6 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/json/VERSION
View file

@ -1 +1 @@
2.4.1 2.5.0

1
ext/json/lib/json/common.rb
View file

@ -71,6 +71,7 @@ module JSON
end end
self.state = generator::State self.state = generator::State
const_set :State, self.state const_set :State, self.state
const_set :SAFE_STATE_PROTOTYPE, State.new # for JRuby
ensure ensure
$VERBOSE = old $VERBOSE = old
end end

2
ext/json/lib/json/version.rb
View file

@ -1,7 +1,7 @@
# frozen_string_literal: false # frozen_string_literal: false
module JSON module JSON
# JSON version # JSON version
VERSION = '2.4.1' VERSION = '2.5.0'
VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc: VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc: VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:

2
test/json/json_generator_test.rb
View file

@ -232,7 +232,7 @@ EOT
end end
def test_gc def test_gc
if respond_to?(:assert_in_out_err) if respond_to?(:assert_in_out_err) && !(RUBY_PLATFORM =~ /java/)
assert_in_out_err(%w[-rjson --disable-gems], <<-EOS, [], []) assert_in_out_err(%w[-rjson --disable-gems], <<-EOS, [], [])
bignum_too_long_to_embed_as_string = 1234567890123456789012345 bignum_too_long_to_embed_as_string = 1234567890123456789012345
expect = bignum_too_long_to_embed_as_string.to_s expect = bignum_too_long_to_embed_as_string.to_s

6
test/json/ractor_test.rb
View file

@ -4,10 +4,6 @@
require 'test_helper' require 'test_helper'
class JSONInRactorTest < Test::Unit::TestCase class JSONInRactorTest < Test::Unit::TestCase
def setup
skip unless defined? Ractor
end
def test_generate def test_generate
assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}") assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
begin; begin;
@ -31,4 +27,4 @@ class JSONInRactorTest < Test::Unit::TestCase
assert_equal(JSON.parse(expected_json), r.take) assert_equal(JSON.parse(expected_json), r.take)
end; end;
end end
end end if defined?(Ractor)

1
tool/sync_default_gems.rb
View file

@ -119,6 +119,7 @@ def sync_default_gems(gem)
rm_rf(%w[ext/json test/json]) rm_rf(%w[ext/json test/json])
cp_r("#{upstream}/ext/json/ext", "ext/json") cp_r("#{upstream}/ext/json/ext", "ext/json")
cp_r("#{upstream}/tests", "test/json") cp_r("#{upstream}/tests", "test/json")
rm_rf("test/json/lib")
cp_r("#{upstream}/lib", "ext/json") cp_r("#{upstream}/lib", "ext/json")
cp_r("#{upstream}/json.gemspec", "ext/json") cp_r("#{upstream}/json.gemspec", "ext/json")
cp_r("#{upstream}/VERSION", "ext/json") cp_r("#{upstream}/VERSION", "ext/json")