Merge pull request #552 from flori/prepare-to-release-2-7-0

Added changes for 2.7.0 and restore entries to 2.6.3 and 2.6.2
ruby · Dec 1, 2023 · 63b074a · 63b074a
2 parents 10a4542 + ca54612
commit 63b074a
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 32 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,30 @@
 # Changes
 
-* `escape_slash` option was renamed as `script_safe` and now also escape U+2028 and U+2029. `escape_slash` is now an alias of `script_safe`.
+### 2023-12-01 (2.7.0)
+
+* Add a strict option to Generator #519
+* `escape_slash` option was renamed as `script_safe` and now also escape U+2028 and U+2029. `escape_slash` is now an alias of `script_safe` #525
+* Remove unnecessary initialization of create_id in JSON.parse() #454
+* Improvements to Hash#to_json in pure implementation generator #203
+* Use ruby_xfree to free buffers #518
+* Fix "unexpected token" offset for Infinity #507
+* Avoid using deprecated BigDecimal.new on JRuby #546
+* Removed code for Ruby 1.8 #540
+* Rename JSON::ParseError to JSON:ParserError #530
+* Call super in included hook #486
+* JRuby requires a minimum of Java 8 #516
+* Always indent even if empty #517
+
+### 2022-11-30 (2.6.3)
+
+* bugfix json/pure mixing escaped with literal unicode raises Encoding::CompatibilityError #483
+* Stop including the parser source __LINE__ in exceptions #470
+
+### 2022-11-17 (2.6.2)
+
+* Remove unknown keyword arg from DateTime.parse #488
+* Ignore java artifacts by @hsbt #489
+* Fix parser bug for empty string allocation #496
 
 ### 2021-10-24 (2.6.1)
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.6.3
+2.7.0
diff --git a/java/src/json/ext/Parser.java b/java/src/json/ext/Parser.java
@@ -343,7 +343,7 @@ private Ruby getRuntime() {
 
 
 
-// line 344 "Parser.java"
+// line 347 "Parser.java"
 private static byte[] init__JSON_value_actions_0()
 {
 	return new byte [] {
@@ -465,14 +465,14 @@ void parseValue(ParserResult res, int p, int pe) {
             IRubyObject result = null;
 
 
-// line 464 "Parser.java"
+// line 469 "Parser.java"
 	{
 	cs = JSON_value_start;
 	}
 
 // line 478 "Parser.rl"
 
-// line 469 "Parser.java"
+// line 476 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -504,7 +504,7 @@ void parseValue(ParserResult res, int p, int pe) {
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 501 "Parser.java"
+// line 508 "Parser.java"
 		}
 	}
 
@@ -676,7 +676,7 @@ else if ( data[p] > _JSON_value_trans_keys[_mid+1] )
                 }
             }
 	break;
-// line 673 "Parser.java"
+// line 680 "Parser.java"
 			}
 		}
 	}
@@ -709,7 +709,7 @@ else if ( data[p] > _JSON_value_trans_keys[_mid+1] )
         }
 
 
-// line 704 "Parser.java"
+// line 713 "Parser.java"
 private static byte[] init__JSON_integer_actions_0()
 {
 	return new byte [] {
@@ -826,15 +826,15 @@ int parseIntegerInternal(int p, int pe) {
             int cs = EVIL;
 
 
-// line 819 "Parser.java"
+// line 830 "Parser.java"
 	{
 	cs = JSON_integer_start;
 	}
 
 // line 518 "Parser.rl"
             int memo = p;
 
-// line 825 "Parser.java"
+// line 838 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -921,7 +921,7 @@ else if ( data[p] > _JSON_integer_trans_keys[_mid+1] )
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 912 "Parser.java"
+// line 925 "Parser.java"
 			}
 		}
 	}
@@ -963,7 +963,7 @@ RubyInteger bytesToInum(Ruby runtime, ByteList num) {
         }
 
 
-// line 952 "Parser.java"
+// line 967 "Parser.java"
 private static byte[] init__JSON_float_actions_0()
 {
 	return new byte [] {
@@ -1084,15 +1084,15 @@ int parseFloatInternal(int p, int pe) {
             int cs = EVIL;
 
 
-// line 1071 "Parser.java"
+// line 1088 "Parser.java"
 	{
 	cs = JSON_float_start;
 	}
 
 // line 573 "Parser.rl"
             int memo = p;
 
-// line 1077 "Parser.java"
+// line 1096 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1179,7 +1179,7 @@ else if ( data[p] > _JSON_float_trans_keys[_mid+1] )
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 1164 "Parser.java"
+// line 1183 "Parser.java"
 			}
 		}
 	}
@@ -1209,7 +1209,7 @@ else if ( data[p] > _JSON_float_trans_keys[_mid+1] )
         }
 
 
-// line 1192 "Parser.java"
+// line 1213 "Parser.java"
 private static byte[] init__JSON_string_actions_0()
 {
 	return new byte [] {
@@ -1319,15 +1319,15 @@ void parseString(ParserResult res, int p, int pe) {
             IRubyObject result = null;
 
 
-// line 1300 "Parser.java"
+// line 1323 "Parser.java"
 	{
 	cs = JSON_string_start;
 	}
 
 // line 621 "Parser.rl"
             int memo = p;
 
-// line 1306 "Parser.java"
+// line 1331 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1429,7 +1429,7 @@ else if ( data[p] > _JSON_string_trans_keys[_mid+1] )
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 1408 "Parser.java"
+// line 1433 "Parser.java"
 			}
 		}
 	}
@@ -1494,7 +1494,7 @@ public void visit(IRubyObject pattern, IRubyObject klass) {
         }
 
 
-// line 1471 "Parser.java"
+// line 1498 "Parser.java"
 private static byte[] init__JSON_array_actions_0()
 {
 	return new byte [] {
@@ -1627,14 +1627,14 @@ void parseArray(ParserResult res, int p, int pe) {
             }
 
 
-// line 1602 "Parser.java"
+// line 1631 "Parser.java"
 	{
 	cs = JSON_array_start;
 	}
 
 // line 722 "Parser.rl"
 
-// line 1607 "Parser.java"
+// line 1638 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1738,7 +1738,7 @@ else if ( data[p] > _JSON_array_trans_keys[_mid+1] )
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 1711 "Parser.java"
+// line 1742 "Parser.java"
 			}
 		}
 	}
@@ -1768,7 +1768,7 @@ else if ( data[p] > _JSON_array_trans_keys[_mid+1] )
         }
 
 
-// line 1739 "Parser.java"
+// line 1772 "Parser.java"
 private static byte[] init__JSON_object_actions_0()
 {
 	return new byte [] {
@@ -1916,14 +1916,14 @@ void parseObject(ParserResult res, int p, int pe) {
             }
 
 
-// line 1885 "Parser.java"
+// line 1920 "Parser.java"
 	{
 	cs = JSON_object_start;
 	}
 
 // line 806 "Parser.rl"
 
-// line 1890 "Parser.java"
+// line 1927 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -2047,7 +2047,7 @@ else if ( data[p] > _JSON_object_trans_keys[_mid+1] )
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 2014 "Parser.java"
+// line 2051 "Parser.java"
 			}
 		}
 	}
@@ -2100,7 +2100,7 @@ else if ( data[p] > _JSON_object_trans_keys[_mid+1] )
         }
 
 
-// line 2065 "Parser.java"
+// line 2104 "Parser.java"
 private static byte[] init__JSON_actions_0()
 {
 	return new byte [] {
@@ -2213,7 +2213,7 @@ public IRubyObject parseImplemetation() {
             ParserResult res = new ParserResult();
 
 
-// line 2176 "Parser.java"
+// line 2217 "Parser.java"
 	{
 	cs = JSON_start;
 	}
@@ -2222,7 +2222,7 @@ public IRubyObject parseImplemetation() {
             p = byteList.begin();
             pe = p + byteList.length();
 
-// line 2183 "Parser.java"
+// line 2226 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -2315,7 +2315,7 @@ else if ( data[p] > _JSON_trans_keys[_mid+1] )
                 }
             }
 	break;
-// line 2276 "Parser.java"
+// line 2319 "Parser.java"
 			}
 		}
 	}

diff --git a/lib/json/version.rb b/lib/json/version.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 module JSON
   # JSON version
-  VERSION         = '2.6.3'
+  VERSION         = '2.7.0'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc: