https://git.ruby-lang.org/ruby.git/commit/?id=0aac138e0b

From 0aac138e0b507c8a361f7cf2f30c276e7110ea33 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Wed, 1 Jul 2020 18:50:39 +0900
Subject: Merge json-2.3.1 from flori/json


diff --git a/ext/json/json.gemspec b/ext/json/json.gemspec
index 30f5d70..cfa3c03 100644
--- a/ext/json/json.gemspec
+++ b/ext/json/json.gemspec
@@ -2,7 +2,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/json/json.gemspec#L2
 
 Gem::Specification.new do |s|
   s.name = "json"
-  s.version = "2.3.0"
+  s.version = "2.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -135,5 +135,5 @@ Gem::Specification.new do |s| https://github.com/ruby/ruby/blob/trunk/ext/json/json.gemspec#L135
   s.test_files = ["tests/test_helper.rb"]
 
   s.add_development_dependency("rake", [">= 0"])
-  s.add_development_dependency("test-unit", ["~> 2.0"])
+  s.add_development_dependency("test-unit", [">= 2.0", "< 4.0"])
 end
diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb
index 9d781df..e4dd3e3 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.3.0'
+  VERSION         = '2.3.1'
   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/test_helper.rb b/test/json/test_helper.rb
index 446c020..c5ec0fc 100644
--- a/test/json/test_helper.rb
+++ b/test/json/test_helper.rb
@@ -1,12 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/test/json/test_helper.rb#L1
 case ENV['JSON']
 when 'pure'
-  $:.unshift File.join(__dir__, '../lib')
+  $:.unshift 'lib'
   require 'json/pure'
 when 'ext'
-  $:.unshift File.join(__dir__, '../ext'), File.join(__dir__, '../lib')
+  $:.unshift 'ext', 'lib'
   require 'json/ext'
 else
-  $:.unshift File.join(__dir__, '../ext'), File.join(__dir__, '../lib')
+  $:.unshift 'ext', 'lib'
   require 'json'
 end
 
-- 
cgit v0.10.2


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