https://git.ruby-lang.org/ruby.git/commit/?id=53e8589c69

From 53e8589c69d1345235d9f02ecbcf6aa32fa9d39c Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Thu, 12 Dec 2019 09:14:09 +0900
Subject: Import json-2.3.0 from flori/json


diff --git a/ext/json/json.gemspec b/ext/json/json.gemspec
index 51dd8f0..d8be2e5 100644
--- a/ext/json/json.gemspec
+++ b/ext/json/json.gemspec
@@ -2,12 +2,12 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/json.gemspec#L2
 
 Gem::Specification.new do |s|
   s.name = "json"
-  s.version = "2.2.0"
+  s.version = "2.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Florian Frank"]
-  s.date = "2019-02-21"
+  s.date = "2019-12-11"
   s.description = "This is a JSON implementation as a Ruby extension in C."
   s.email = "flori@p..."
   s.extensions = ["ext/json/ext/generator/extconf.rb", "ext/json/ext/parser/extconf.rb", "ext/json/extconf.rb"]
@@ -124,7 +124,7 @@ Gem::Specification.new do |s| https://github.com/ruby/ruby/blob/trunk/ext/json/json.gemspec#L124
   s.licenses = ["Ruby"]
   s.rdoc_options = ["--title", "JSON implemention for Ruby", "--main", "README.md"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = "3.0.2"
+  s.rubygems_version = "3.0.3"
   s.summary = "JSON Implementation for Ruby"
   s.test_files = ["tests/test_helper.rb"]
 
diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb
index 115eb5b..9d781df 100644
--- a/ext/json/lib/json/version.rb
+++ b/ext/json/lib/json/version.rb
@@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/lib/json/version.rb#L1
 # frozen_string_literal: false
 module JSON
   # JSON version
-  VERSION         = '2.2.0'
+  VERSION         = '2.3.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 10cbcd1..ee19fa5 100644
--- a/test/json/json_generator_test.rb
+++ b/test/json/json_generator_test.rb
@@ -49,6 +49,7 @@ EOT https://github.com/ruby/ruby/blob/trunk/test/json/json_generator_test.rb#L49
   end
 
   def test_remove_const_segv
+    return if RUBY_ENGINE == 'jruby'
     stress = GC.stress
     const = JSON::SAFE_STATE_PROTOTYPE.dup
 
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/