summaryrefslogtreecommitdiff
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
parentf2f00e24fa14b8114d6c3bea11170b2b3e309719 (diff)
Prepare to release json-2.5.0
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3975
-rw-r--r--ext/json/VERSION2
-rw-r--r--ext/json/lib/json/common.rb1
-rw-r--r--ext/json/lib/json/version.rb2
-rw-r--r--test/json/json_generator_test.rb2
-rw-r--r--test/json/ractor_test.rb6
-rw-r--r--tool/sync_default_gems.rb1
6 files changed, 6 insertions, 8 deletions
diff --git a/ext/json/VERSION b/ext/json/VERSION
index 005119baaa0..437459cd94c 100644
--- a/ext/json/VERSION
+++ b/ext/json/VERSION
@@ -1 +1 @@
-2.4.1
+2.5.0
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:
diff --git a/test/json/json_generator_test.rb b/test/json/json_generator_test.rb
index 5bafc3ead46..f31b6b290e5 100644
--- a/test/json/json_generator_test.rb
+++ b/test/json/json_generator_test.rb
@@ -232,7 +232,7 @@ EOT
end
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, [], [])
bignum_too_long_to_embed_as_string = 1234567890123456789012345
expect = bignum_too_long_to_embed_as_string.to_s
diff --git a/test/json/ractor_test.rb b/test/json/ractor_test.rb
index 96d1528c5be..71105e55ecd 100644
--- a/test/json/ractor_test.rb
+++ b/test/json/ractor_test.rb
@@ -4,10 +4,6 @@
require 'test_helper'
class JSONInRactorTest < Test::Unit::TestCase
- def setup
- skip unless defined? Ractor
- end
-
def test_generate
assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
begin;
@@ -31,4 +27,4 @@ class JSONInRactorTest < Test::Unit::TestCase
assert_equal(JSON.parse(expected_json), r.take)
end;
end
-end
+end if defined?(Ractor)
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index e7a9a9cc441..620215067d9 100644
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -119,6 +119,7 @@ def sync_default_gems(gem)
rm_rf(%w[ext/json test/json])
cp_r("#{upstream}/ext/json/ext", "ext/json")
cp_r("#{upstream}/tests", "test/json")
+ rm_rf("test/json/lib")
cp_r("#{upstream}/lib", "ext/json")
cp_r("#{upstream}/json.gemspec", "ext/json")
cp_r("#{upstream}/VERSION", "ext/json")