mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	Prepare to release json-2.5.0
This commit is contained in:
		
							parent
							
								
									f2f00e24fa
								
							
						
					
					
						commit
						edb76e8765
					
				
				
				Notes:
				
					git
				
				2020-12-22 19:44:53 +09:00 
				
			
			
			
		
		
					 6 changed files with 6 additions and 8 deletions
				
			
		|  | @ -1 +1 @@ | |||
| 2.4.1 | ||||
| 2.5.0 | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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: | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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) | ||||
|  |  | |||
|  | @ -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") | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Hiroshi SHIBATA
						Hiroshi SHIBATA