1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge json-2.3.1 from flori/json

Browse Source
This commit is contained in:
Hiroshi SHIBATA 2020-07-01 18:50:39 +09:00
parent 26041da2fb
commit 0aac138e0b
No known key found for this signature in database
GPG Key ID: F9CF13417264FAC2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/json/json.gemspec
View File

@ -2,7 +2,7 @@
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = "json" 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.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.require_paths = ["lib"] s.require_paths = ["lib"]
@ -135,5 +135,5 @@ Gem::Specification.new do |s|
s.test_files = ["tests/test_helper.rb"] s.test_files = ["tests/test_helper.rb"]
s.add_development_dependency("rake", [">= 0"]) 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 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.3.0' VERSION = '2.3.1'
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:

6
test/json/test_helper.rb
View File

@ -1,12 +1,12 @@
case ENV['JSON'] case ENV['JSON']
when 'pure' when 'pure'
$:.unshift File.join(__dir__, '../lib') $:.unshift 'lib'
require 'json/pure' require 'json/pure'
when 'ext' when 'ext'
$:.unshift File.join(__dir__, '../ext'), File.join(__dir__, '../lib') $:.unshift 'ext', 'lib'
require 'json/ext' require 'json/ext'
else else
$:.unshift File.join(__dir__, '../ext'), File.join(__dir__, '../lib') $:.unshift 'ext', 'lib'
require 'json' require 'json'
end end