ruby-changes:64226
From: Hiroshi <ko1@a...>
Date: Thu, 17 Dec 2020 14:20:57 +0900 (JST)
Subject: [ruby-changes:64226] 46ea74297e (master): Bump version to json-2.4.1 and use VERSION file for json version same as upstream
https://git.ruby-lang.org/ruby.git/commit/?id=46ea74297e From 46ea74297eb3e46e19fb692a8d8eef817b93a49b Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> Date: Thu, 17 Dec 2020 14:20:42 +0900 Subject: Bump version to json-2.4.1 and use VERSION file for json version same as upstream diff --git a/ext/json/VERSION b/ext/json/VERSION new file mode 100644 index 0000000..005119b --- /dev/null +++ b/ext/json/VERSION @@ -0,0 +1 @@ +2.4.1 diff --git a/ext/json/json.gemspec b/ext/json/json.gemspec index 11b2825..13196df 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.4.0" + s.version = File.read('VERSION').chomp s.summary = "JSON Implementation for Ruby" s.description = "This is a JSON implementation as a Ruby extension in C." @@ -12,18 +12,13 @@ Gem::Specification.new do |s| https://github.com/ruby/ruby/blob/trunk/ext/json/json.gemspec#L12 s.extensions = ["ext/json/ext/generator/extconf.rb", "ext/json/ext/parser/extconf.rb", "ext/json/extconf.rb"] s.extra_rdoc_files = ["README.md"] - s.rdoc_options = ["--title", "JSON implemention for Ruby", "--main", "README.md"] + s.rdoc_options = ["--title", "JSON implementation for Ruby", "--main", "README.md"] s.files = [ - ".gitignore", - ".travis.yml", "CHANGES.md", "Gemfile", "LICENSE", - "README-json-jruby.md", "README.md", - "Rakefile", "VERSION", - "diagrams/.keep", "ext/json/ext/fbuffer/fbuffer.h", "ext/json/ext/generator/depend", "ext/json/ext/generator/extconf.rb", @@ -35,23 +30,7 @@ Gem::Specification.new do |s| https://github.com/ruby/ruby/blob/trunk/ext/json/json.gemspec#L30 "ext/json/ext/parser/parser.h", "ext/json/ext/parser/parser.rl", "ext/json/extconf.rb", - "install.rb", - "java/src/json/ext/ByteListTranscoder.java", - "java/src/json/ext/Generator.java", - "java/src/json/ext/GeneratorMethods.java", - "java/src/json/ext/GeneratorService.java", - "java/src/json/ext/GeneratorState.java", - "java/src/json/ext/OptionsReader.java", - "java/src/json/ext/Parser.java", - "java/src/json/ext/Parser.rl", - "java/src/json/ext/ParserService.java", - "java/src/json/ext/RuntimeInfo.java", - "java/src/json/ext/StringDecoder.java", - "java/src/json/ext/StringEncoder.java", - "java/src/json/ext/Utils.java", - "json-java.gemspec", "json.gemspec", - "json_pure.gemspec", "lib/json.rb", "lib/json/add/bigdecimal.rb", "lib/json/add/complex.rb", @@ -75,53 +54,7 @@ Gem::Specification.new do |s| https://github.com/ruby/ruby/blob/trunk/ext/json/json.gemspec#L54 "lib/json/pure/generator.rb", "lib/json/pure/parser.rb", "lib/json/version.rb", - "references/rfc7159.txt", - "tests/fixtures/fail10.json", - "tests/fixtures/fail11.json", - "tests/fixtures/fail12.json", - "tests/fixtures/fail13.json", - "tests/fixtures/fail14.json", - "tests/fixtures/fail18.json", - "tests/fixtures/fail19.json", - "tests/fixtures/fail2.json", - "tests/fixtures/fail20.json", - "tests/fixtures/fail21.json", - "tests/fixtures/fail22.json", - "tests/fixtures/fail23.json", - "tests/fixtures/fail24.json", - "tests/fixtures/fail25.json", - "tests/fixtures/fail27.json", - "tests/fixtures/fail28.json", - "tests/fixtures/fail3.json", - "tests/fixtures/fail4.json", - "tests/fixtures/fail5.json", - "tests/fixtures/fail6.json", - "tests/fixtures/fail7.json", - "tests/fixtures/fail8.json", - "tests/fixtures/fail9.json", - "tests/fixtures/obsolete_fail1.json", - "tests/fixtures/pass1.json", - "tests/fixtures/pass15.json", - "tests/fixtures/pass16.json", - "tests/fixtures/pass17.json", - "tests/fixtures/pass2.json", - "tests/fixtures/pass26.json", - "tests/fixtures/pass3.json", - "tests/json_addition_test.rb", - "tests/json_common_interface_test.rb", - "tests/json_encoding_test.rb", - "tests/json_ext_parser_test.rb", - "tests/json_fixtures_test.rb", - "tests/json_generator_test.rb", - "tests/json_generic_object_test.rb", - "tests/json_parser_test.rb", - "tests/json_string_matching_test.rb", - "tests/test_helper.rb", - "tests/test_helper.rb", - "tools/diff.sh", - "tools/fuzz.rb", - "tools/server.rb", - ] + ] + Dir["tests/**/*"] s.homepage = "http://flori.github.com/json" s.metadata = { 'bug_tracker_uri' => 'https://github.com/flori/json/issues', @@ -135,6 +68,6 @@ Gem::Specification.new do |s| https://github.com/ruby/ruby/blob/trunk/ext/json/json.gemspec#L68 s.required_ruby_version = Gem::Requirement.new(">= 2.0") s.test_files = ["tests/test_helper.rb"] - s.add_development_dependency("rake", [">= 0"]) - s.add_development_dependency("test-unit", [">= 2.0", "< 4.0"]) + s.add_development_dependency "rake" + s.add_development_dependency "test-unit" end diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb index e4dd3e3..5502a4d 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.1' + VERSION = '2.4.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/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index d450921..bf7bf37 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -121,6 +121,7 @@ def sync_default_gems(gem) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L121 cp_r("#{upstream}/tests", "test/json") cp_r("#{upstream}/lib", "ext/json") cp_r("#{upstream}/json.gemspec", "ext/json") + cp_r("#{upstream}/VERSION", "ext/json") rm_rf(%w[ext/json/lib/json/ext ext/json/lib/json/pure.rb ext/json/lib/json/pure]) `git checkout ext/json/extconf.rb ext/json/parser/prereq.mk ext/json/generator/depend ext/json/parser/depend ext/json/depend` when "psych" -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/