From 4935c676df759054b39d1daf4ca339eea5e052b0 Mon Sep 17 00:00:00 2001
From: Yuki Kurihara <co000ri@gmail.com>
Date: Mon, 12 May 2025 07:06:48 +0000
Subject: [PATCH 1/3] Merge pull request #2366 from
 ksss/json-remove-deprecated-methods

Remove deprecated methods in `JSON`
---
 stdlib/json/0/json.rbs              |  52 +++-----------
 test/stdlib/json/JSONKernel_test.rb |  22 ------
 test/stdlib/json/JSON_test.rb       | 104 +---------------------------
 3 files changed, 11 insertions(+), 167 deletions(-)

diff --git a/stdlib/json/0/json.rbs b/stdlib/json/0/json.rbs
index 6d242c831..5750d9c5c 100644
--- a/stdlib/json/0/json.rbs
+++ b/stdlib/json/0/json.rbs
@@ -14,9 +14,6 @@ end
 class JSON::GeneratorError < JSON::JSONError
 end
 
-class JSON::UnparserError < JSON::GeneratorError
-end
-
 # <!-- rdoc-file=ext/json/lib/json/common.rb -->
 # This exception is raised if a parser error occurs.
 #
@@ -754,6 +751,7 @@ module JSON
   #     opts = JSON.dump_default_options
   #     opts # => {:max_nesting=>false, :allow_nan=>true}
   #
+  %a{deprecated}
   def self.dump_default_options: () -> options
 
   # <!-- rdoc-file=ext/json/lib/json/common.rb -->
@@ -761,6 +759,7 @@ module JSON
   #     opts = JSON.dump_default_options
   #     opts # => {:max_nesting=>false, :allow_nan=>true}
   #
+  %a{deprecated}
   def self.dump_default_options=: (options) -> options
 
   # <!--
@@ -778,12 +777,9 @@ module JSON
   #     # Raises SystemStackError (stack level too deep):
   #     JSON.fast_generate(a)
   #
+  %a{deprecated}
   def self?.fast_generate: (_ToJson obj, ?options opts) -> String
 
-  alias self.fast_unparse self.fast_generate
-
-  alias fast_unparse fast_generate
-
   # <!--
   #   rdoc-file=ext/json/lib/json/common.rb
   #   - JSON.generate(obj, opts = nil) -> new_string
@@ -830,14 +826,6 @@ module JSON
 
   def self.generator=: (generator generator) -> void
 
-  # <!--
-  #   rdoc-file=ext/json/lib/json/common.rb
-  #   - iconv(to, from, string)
-  # -->
-  # Encodes string using String.encode.
-  #
-  def self.iconv: (encoding to, encoding from, String string) -> String
-
   # <!--
   #   rdoc-file=ext/json/lib/json/common.rb
   #   - JSON.load(source, proc = nil, options = {}) -> object
@@ -974,7 +962,8 @@ module JSON
   #        #<Admin:0x00000000064c41f8
   #        @attributes={"type"=>"Admin", "password"=>"0wn3d"}>}
   #
-  def self?.load: (string | _ReadableIO | _Read source, ?Proc proc, ?options options) -> untyped
+  def self?.load: (string | _ReadableIO | _Read source, ?options options) -> untyped
+                | [T] (string | _ReadableIO | _Read source, ^(?) -> T, ?options options) -> T
 
   # <!--
   #   rdoc-file=ext/json/lib/json/common.rb
@@ -1003,6 +992,7 @@ module JSON
   #     opts = JSON.load_default_options
   #     opts # => {:max_nesting=>false, :allow_nan=>true, :allow_blank=>true, :create_additions=>true}
   #
+  %a{deprecated}
   def self.load_default_options: () -> options
 
   # <!-- rdoc-file=ext/json/lib/json/common.rb -->
@@ -1010,6 +1000,7 @@ module JSON
   #     opts = JSON.load_default_options
   #     opts # => {:max_nesting=>false, :allow_nan=>true, :allow_blank=>true, :create_additions=>true}
   #
+  %a{deprecated}
   def self.load_default_options=: (options) -> options
 
   # <!--
@@ -1120,29 +1111,6 @@ module JSON
   #
   def self?.pretty_generate: (_ToJson obj, ?options opts) -> untyped
 
-  alias self.pretty_unparse self.pretty_generate
-
-  alias pretty_unparse pretty_generate
-
-  # Recursively calls passed *Proc* if the parsed data structure is an *Array* or
-  # *Hash*
-  #
-  def self?.recurse_proc: (untyped result) { (*untyped) -> void } -> void
-
-  # <!--
-  #   rdoc-file=ext/json/lib/json/common.rb
-  #   - restore(source, proc = nil, options = nil)
-  # -->
-  #
-  alias self.restore self.load
-
-  # <!--
-  #   rdoc-file=ext/json/lib/json/common.rb
-  #   - restore(source, proc = nil, options = nil)
-  # -->
-  #
-  alias restore load
-
   # <!-- rdoc-file=ext/json/lib/json/common.rb -->
   # Sets or Returns the JSON generator state class that is used by JSON.
   #
@@ -1152,10 +1120,6 @@ module JSON
   # Sets or Returns the JSON generator state class that is used by JSON.
   #
   def self.state=: (state) -> state
-
-  alias self.unparse self.generate
-
-  alias unparse generate
 end
 
 JSON::FAST_STATE_PROTOTYPE: JSON::state
@@ -1193,6 +1157,7 @@ module Kernel
   # Outputs *objs* to STDOUT as JSON strings in the shortest form, that is in one
   # line.
   #
+  %a{deprecated}
   def j: (*_ToJson) -> nil
 
   # <!--
@@ -1202,6 +1167,7 @@ module Kernel
   # Outputs *objs* to STDOUT as JSON strings in a pretty format, with indentation
   # and over many lines.
   #
+  %a{deprecated}
   def jj: (*_ToJson) -> nil
 
   # <!--
diff --git a/test/stdlib/json/JSONKernel_test.rb b/test/stdlib/json/JSONKernel_test.rb
index d5ac73aa3..0ecb5b2ee 100644
--- a/test/stdlib/json/JSONKernel_test.rb
+++ b/test/stdlib/json/JSONKernel_test.rb
@@ -7,28 +7,6 @@ class JSONKernelInstanceTest < Test::Unit::TestCase
   library "json"
   testing "::Kernel"
 
-  def silent
-    orig_stdout = $stdout
-    $stdout = StringIO.new
-    yield
-  ensure
-    $stdout = orig_stdout
-  end
-
-  def test_j
-    silent do
-      assert_send_type("(Integer) -> nil", self, :j, 1)
-      assert_send_type("(Array[Integer]) -> nil", self, :j, [1, 2, 3])
-    end
-  end
-
-  def test_jj
-    silent do
-      assert_send_type("(Integer) -> nil", self, :jj, 1)
-      assert_send_type("(Array[Integer]) -> nil", self, :jj, [1, 2, 3])
-    end
-  end
-
   def test_JSON
     assert_send_type("(String) -> Hash[String, Integer]", self, :JSON, '{"a": 1}')
     assert_send_type("(Array[Integer]) -> String", self, :JSON, [1, 2, 3])
diff --git a/test/stdlib/json/JSON_test.rb b/test/stdlib/json/JSON_test.rb
index 79012e629..ae9433a39 100644
--- a/test/stdlib/json/JSON_test.rb
+++ b/test/stdlib/json/JSON_test.rb
@@ -61,27 +61,6 @@ def test_dump
     assert_send_type "(ToJson, JsonWrite, Integer) -> JsonWrite", JSON, :dump, ToJson.new, JsonWrite.new, 100
   end
 
-  def test_dump_default_options
-    assert_send_type "() -> { max_nesting: false, allow_nan: true }", JSON, :dump_default_options
-  end
-
-  def test_dump_default_options_eq
-    assert_send_type "(max_nesting: false, allow_nan: true, allow_blank: true) -> { max_nesting: false, allow_nan: true, allow_blank: true }",
-                     JSON,
-                     :dump_default_options=,
-                     { max_nesting: false, allow_nan: true, allow_blank: true }
-  end
-
-  def test_fast_generate
-    assert_send_type "(ToJson) -> String", JSON, :fast_generate, ToJson.new
-    assert_send_type "(ToJson, indent: String) -> String", JSON, :fast_generate, ToJson.new, { indent: "\t" }
-  end
-
-  def test_fast_unparse
-    assert_send_type "(ToJson) -> String", JSON, :fast_unparse, ToJson.new
-    assert_send_type "(ToJson, indent: String) -> String", JSON, :fast_unparse, ToJson.new, { indent: "\t" }
-  end
-
   def test_generate
     assert_send_type "(ToJson) -> String", JSON, :generate, ToJson.new
     assert_send_type "(ToJson, indent: String) -> String", JSON, :generate, ToJson.new, { indent: "\t" }
@@ -95,19 +74,13 @@ def test_generator=
     assert_send_type "(singleton(JSON::Ext::Generator)) -> void", JSON, :generator=, JSON::Ext::Generator
   end
 
-  def test_iconv
-    assert_send_type "(Encoding, Encoding, String) -> String", JSON, :iconv, Encoding::UTF_8, Encoding::UTF_16, "".encode(Encoding::UTF_16)
-    assert_send_type "(String, String, String) -> String", JSON, :iconv, 'UTF-8', 'UTF-16', "".encode(Encoding::UTF_16)
-    assert_send_type "(_ToStr, _ToStr, String) -> String", JSON, :iconv, JsonToStr.new('UTF-8'), JsonToStr.new('UTF-16'), "".encode(Encoding::UTF_16)
-  end
-
   def test_load
     assert_send_type "(String) -> 42", JSON, :load, "42"
     assert_send_type "(_ToStr) -> 42", JSON, :load, JsonToStr.new("42")
     assert_send_type "(JsonToReadableIO) -> 42", JSON, :load, JsonToReadableIO.new
     assert_send_type "(JsonRead) -> 42", JSON, :load, JsonRead.new
-    assert_send_type "(String, Proc) -> 42", JSON, :load, "42", proc { }
-    assert_send_type "(String, Proc, Hash[untyped, untyped]) -> 42", JSON, :load, "42", proc { }, { alllow_nan: true }
+    assert_send_type "(String, Proc) -> 42", JSON, :load, "42", proc { |a| a }
+    assert_send_type "(String, Proc, Hash[untyped, untyped]) -> 42", JSON, :load, "42", proc { |a| a }, { alllow_nan: true }
   end
 
   def test_load_file
@@ -130,14 +103,6 @@ def test_load_file!
     end
   end
 
-  def test_load_default_options
-    assert_send_type "() -> Hash[untyped, untyped]", JSON, :load_default_options
-  end
-
-  def test_load_default_options_eq
-    assert_send_type "(allow_nan: true) -> Hash[untyped, untyped]", JSON, :load_default_options=, { allow_nan: true }
-  end
-
   def test_parse
     assert_send_type "(String) -> 42", JSON, :parse, "42"
     assert_send_type "(_ToStr) -> 42", JSON, :parse, JsonToStr.new("42")
@@ -163,24 +128,6 @@ def test_pretty_generate
     assert_send_type "(ToJson, indent: String) -> String", JSON, :pretty_generate, ToJson.new, { indent: "\t" }
   end
 
-  def test_pretty_unparse
-    assert_send_type "(ToJson) -> String", JSON, :pretty_unparse, ToJson.new
-    assert_send_type "(ToJson, indent: String) -> String", JSON, :pretty_unparse, ToJson.new, { indent: "\t" }
-  end
-
-  def test_recurse_proc
-    assert_send_type "(Integer) { (Integer) -> void } -> void", JSON, :recurse_proc, 42 do |_i| end
-  end
-
-  def test_restore
-    assert_send_type "(String) -> 42", JSON, :restore, "42"
-    assert_send_type "(_ToStr) -> 42", JSON, :restore, JsonToStr.new("42")
-    assert_send_type "(JsonToReadableIO) -> 42", JSON, :restore, JsonToReadableIO.new
-    assert_send_type "(JsonRead) -> 42", JSON, :restore, JsonRead.new
-    assert_send_type "(String, Proc) -> 42", JSON, :restore, "42", proc { }
-    assert_send_type "(String, Proc, Hash[untyped, untyped]) -> 42", JSON, :restore, "42", proc { }, { alllow_nan: true }
-  end
-
   def test_state
     assert_send_type "() -> singleton(JSON::Ext::Generator::State)", JSON, :state
   end
@@ -188,11 +135,6 @@ def test_state
   def test_state_eq
     assert_send_type "(singleton(JSON::Ext::Generator::State)) -> singleton(JSON::Ext::Generator::State)", JSON, :state=, JSON::Ext::Generator::State
   end
-
-  def test_unparse
-    assert_send_type "(ToJson) -> String", JSON, :unparse, ToJson.new
-    assert_send_type "(ToJson, indent: String) -> String", JSON, :unparse, ToJson.new, { indent: "\t" }
-  end
 end
 
 class JSONInstanceTest < Test::Unit::TestCase
@@ -217,30 +159,11 @@ def test_dump
     assert_send_type "(ToJson, JsonWrite, Integer) -> JsonWrite", MyJSON.new, :dump, ToJson.new, JsonWrite.new, 100
   end
 
-  def test_fast_generate
-    assert_send_type "(ToJson) -> String", MyJSON.new, :fast_generate, ToJson.new
-    assert_send_type "(ToJson, indent: String) -> String", MyJSON.new, :fast_generate, ToJson.new, { indent: "\t" }
-  end
-
-  def test_fast_unparse
-    assert_send_type "(ToJson) -> String", MyJSON.new, :fast_unparse, ToJson.new
-    assert_send_type "(ToJson, indent: String) -> String", MyJSON.new, :fast_unparse, ToJson.new, { indent: "\t" }
-  end
-
   def test_generate
     assert_send_type "(ToJson) -> String", MyJSON.new, :generate, ToJson.new
     assert_send_type "(ToJson, indent: String) -> String", MyJSON.new, :generate, ToJson.new, { indent: "\t" }
   end
 
-  def test_load
-    assert_send_type "(String) -> 42", MyJSON.new, :load, "42"
-    assert_send_type "(_ToStr) -> 42", MyJSON.new, :load, JsonToStr.new("42")
-    assert_send_type "(JsonToReadableIO) -> 42", MyJSON.new, :load, JsonToReadableIO.new
-    assert_send_type "(JsonRead) -> 42", MyJSON.new, :load, JsonRead.new
-    assert_send_type "(String, Proc) -> 42", MyJSON.new, :load, "42", proc { }
-    assert_send_type "(String, Proc, Hash[untyped, untyped]) -> 42", MyJSON.new, :load, "42", proc { }, { alllow_nan: true }
-  end
-
   def test_parse
     assert_send_type "(String) -> 42", MyJSON.new, :parse, "42"
     assert_send_type "(_ToStr) -> 42", MyJSON.new, :parse, JsonToStr.new("42")
@@ -258,29 +181,6 @@ def test_pretty_generate
     assert_send_type "(ToJson, indent: String) -> String", MyJSON.new, :pretty_generate, ToJson.new, { indent: "\t" }
   end
 
-  def test_pretty_unparse
-    assert_send_type "(ToJson) -> String", MyJSON.new, :pretty_unparse, ToJson.new
-    assert_send_type "(ToJson, indent: String) -> String", MyJSON.new, :pretty_unparse, ToJson.new, { indent: "\t" }
-  end
-
-  def test_recurse_proc
-    assert_send_type "(Integer) { (Integer) -> void } -> void", MyJSON.new, :recurse_proc, 42 do |_i| end
-  end
-
-  def test_restore
-    assert_send_type "(String) -> 42", MyJSON.new, :restore, "42"
-    assert_send_type "(_ToStr) -> 42", MyJSON.new, :restore, JsonToStr.new("42")
-    assert_send_type "(JsonToReadableIO) -> 42", MyJSON.new, :restore, JsonToReadableIO.new
-    assert_send_type "(JsonRead) -> 42", MyJSON.new, :restore, JsonRead.new
-    assert_send_type "(String, Proc) -> 42", MyJSON.new, :restore, "42", proc { }
-    assert_send_type "(String, Proc, Hash[untyped, untyped]) -> 42", MyJSON.new, :restore, "42", proc { }, { alllow_nan: true }
-  end
-
-  def test_unparse
-    assert_send_type "(ToJson) -> String", MyJSON.new, :unparse, ToJson.new
-    assert_send_type "(ToJson, indent: String) -> String", MyJSON.new, :unparse, ToJson.new, { indent: "\t" }
-  end
-
   def test_to_json_with_object
     assert_send_type "() -> String", Object.new, :to_json
     assert_send_type "(JSON::State) -> String",  Object.new, :to_json, JSON::State.new

From f0632caca3c5eebdaf3523065aef971c1fb68b67 Mon Sep 17 00:00:00 2001
From: Yuki Kurihara <co000ri@gmail.com>
Date: Tue, 11 Nov 2025 08:08:50 +0000
Subject: [PATCH 2/3] Merge pull request #2701 from ruby/json-deep-const-get

Remove reference to `JSON.deep_const_get`
---
 stdlib/json/0/json.rbs        | 2 --
 test/stdlib/json/JSON_test.rb | 6 ------
 2 files changed, 8 deletions(-)

diff --git a/stdlib/json/0/json.rbs b/stdlib/json/0/json.rbs
index 5750d9c5c..fd1c24560 100644
--- a/stdlib/json/0/json.rbs
+++ b/stdlib/json/0/json.rbs
@@ -708,8 +708,6 @@ module JSON
   #
   def self.create_id=: (_ToS create_id) -> _ToS
 
-  def self.deep_const_get: (interned path) -> untyped
-
   # <!--
   #   rdoc-file=ext/json/lib/json/common.rb
   #   - JSON.dump(obj, io = nil, limit = nil)
diff --git a/test/stdlib/json/JSON_test.rb b/test/stdlib/json/JSON_test.rb
index ae9433a39..3f151eec7 100644
--- a/test/stdlib/json/JSON_test.rb
+++ b/test/stdlib/json/JSON_test.rb
@@ -47,12 +47,6 @@ def test_create_id_eq
     assert_send_type "(String) -> String", JSON, :create_id=, "json_class"
   end
 
-  def test_deep_const_get
-    with_interned("File") do |val|
-      assert_send_type "(interned) -> singleton(File)", JSON, :deep_const_get, val
-    end
-  end
-
   def test_dump
     assert_send_type "(ToJson) -> String", JSON, :dump, ToJson.new
     assert_send_type "(ToJson, Integer) -> String", JSON, :dump, ToJson.new, 100

From 6118f1600019388b15c0cf24d9b003d43d08e22f Mon Sep 17 00:00:00 2001
From: Soutaro Matsumoto <matsumoto@soutaro.com>
Date: Thu, 11 Dec 2025 12:31:40 +0900
Subject: [PATCH 3/3] Update json gem

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 033a820f4..7ffff1137 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem "rspec"
 gem "rubocop"
 gem "rubocop-rubycw"
 gem "rubocop-on-rbs"
-gem "json", "~> 2.10.2"
+gem "json"
 gem "json-schema"
 gem "goodcheck"
 gem 'digest'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2c64c708b..76106c26f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,7 +55,7 @@ GEM
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.10.2)
+    json (2.17.1)
     json-schema (6.0.0)
       addressable (~> 2.8)
       bigdecimal (~> 3.1)
@@ -201,7 +201,7 @@ DEPENDENCIES
   fileutils
   goodcheck
   irb
-  json (~> 2.10.2)
+  json
   json-schema
   memory_profiler
   minitest