From 7bbecaec118c7428baacec6d3cb181ce6024b383 Mon Sep 17 00:00:00 2001
From: Andrew Konchin <andry.konchin@gmail.com>
Date: Wed, 19 Nov 2025 23:40:27 +0200
Subject: [PATCH] Replace 3.5 with 4.0 in version guards

---
 command_line/dash_0_spec.rb                          | 2 +-
 core/enumerable/to_set_spec.rb                       | 4 ++--
 core/file/stat/birthtime_spec.rb                     | 2 +-
 core/kernel/caller_locations_spec.rb                 | 4 ++--
 core/kernel/caller_spec.rb                           | 4 ++--
 core/kernel/inspect_spec.rb                          | 2 +-
 core/kernel/require_spec.rb                          | 4 ++--
 core/marshal/dump_spec.rb                            | 6 +++---
 core/method/source_location_spec.rb                  | 4 ++--
 core/module/ruby2_keywords_spec.rb                   | 2 +-
 core/module/set_temporary_name_spec.rb               | 2 +-
 core/objectspace/_id2ref_spec.rb                     | 4 ++--
 core/proc/ruby2_keywords_spec.rb                     | 2 +-
 core/proc/source_location_spec.rb                    | 8 ++++----
 core/process/status/bit_and_spec.rb                  | 4 ++--
 core/process/status/right_shift_spec.rb              | 4 ++--
 core/range/max_spec.rb                               | 4 ++--
 core/range/reverse_each_spec.rb                      | 2 +-
 core/set/compare_by_identity_spec.rb                 | 4 ++--
 core/set/divide_spec.rb                              | 4 ++--
 core/set/equal_value_spec.rb                         | 2 +-
 core/set/flatten_merge_spec.rb                       | 2 +-
 core/set/flatten_spec.rb                             | 4 ++--
 core/set/hash_spec.rb                                | 2 +-
 core/set/join_spec.rb                                | 2 +-
 core/set/pretty_print_cycle_spec.rb                  | 4 ++--
 core/set/proper_subset_spec.rb                       | 2 +-
 core/set/proper_superset_spec.rb                     | 2 +-
 core/set/shared/inspect.rb                           | 8 ++++----
 core/set/sortedset/sortedset_spec.rb                 | 2 +-
 core/set/subset_spec.rb                              | 2 +-
 core/set/superset_spec.rb                            | 2 +-
 core/unboundmethod/source_location_spec.rb           | 4 ++--
 language/numbered_parameters_spec.rb                 | 4 ++--
 language/predefined_spec.rb                          | 8 ++++----
 language/regexp_spec.rb                              | 2 +-
 language/send_spec.rb                                | 2 +-
 language/variables_spec.rb                           | 4 ++--
 library/cgi/cookie/domain_spec.rb                    | 2 +-
 library/cgi/cookie/expires_spec.rb                   | 2 +-
 library/cgi/cookie/initialize_spec.rb                | 2 +-
 library/cgi/cookie/name_spec.rb                      | 2 +-
 library/cgi/cookie/parse_spec.rb                     | 2 +-
 library/cgi/cookie/path_spec.rb                      | 2 +-
 library/cgi/cookie/secure_spec.rb                    | 2 +-
 library/cgi/cookie/to_s_spec.rb                      | 2 +-
 library/cgi/cookie/value_spec.rb                     | 2 +-
 library/cgi/escapeElement_spec.rb                    | 4 ++--
 library/cgi/htmlextension/a_spec.rb                  | 2 +-
 library/cgi/htmlextension/base_spec.rb               | 2 +-
 library/cgi/htmlextension/blockquote_spec.rb         | 2 +-
 library/cgi/htmlextension/br_spec.rb                 | 2 +-
 library/cgi/htmlextension/caption_spec.rb            | 2 +-
 library/cgi/htmlextension/checkbox_group_spec.rb     | 2 +-
 library/cgi/htmlextension/checkbox_spec.rb           | 2 +-
 library/cgi/htmlextension/doctype_spec.rb            | 2 +-
 library/cgi/htmlextension/file_field_spec.rb         | 2 +-
 library/cgi/htmlextension/form_spec.rb               | 2 +-
 library/cgi/htmlextension/frame_spec.rb              | 2 +-
 library/cgi/htmlextension/frameset_spec.rb           | 2 +-
 library/cgi/htmlextension/hidden_spec.rb             | 2 +-
 library/cgi/htmlextension/html_spec.rb               | 2 +-
 library/cgi/htmlextension/image_button_spec.rb       | 2 +-
 library/cgi/htmlextension/img_spec.rb                | 2 +-
 library/cgi/htmlextension/multipart_form_spec.rb     | 2 +-
 library/cgi/htmlextension/password_field_spec.rb     | 2 +-
 library/cgi/htmlextension/popup_menu_spec.rb         | 2 +-
 library/cgi/htmlextension/radio_button_spec.rb       | 2 +-
 library/cgi/htmlextension/radio_group_spec.rb        | 2 +-
 library/cgi/htmlextension/reset_spec.rb              | 2 +-
 library/cgi/htmlextension/scrolling_list_spec.rb     | 2 +-
 library/cgi/htmlextension/submit_spec.rb             | 2 +-
 library/cgi/htmlextension/text_field_spec.rb         | 2 +-
 library/cgi/htmlextension/textarea_spec.rb           | 2 +-
 library/cgi/http_header_spec.rb                      | 2 +-
 library/cgi/initialize_spec.rb                       | 2 +-
 library/cgi/out_spec.rb                              | 2 +-
 library/cgi/parse_spec.rb                            | 2 +-
 library/cgi/pretty_spec.rb                           | 2 +-
 library/cgi/print_spec.rb                            | 2 +-
 library/cgi/queryextension/accept_charset_spec.rb    | 2 +-
 library/cgi/queryextension/accept_encoding_spec.rb   | 2 +-
 library/cgi/queryextension/accept_language_spec.rb   | 2 +-
 library/cgi/queryextension/accept_spec.rb            | 2 +-
 library/cgi/queryextension/auth_type_spec.rb         | 2 +-
 library/cgi/queryextension/cache_control_spec.rb     | 2 +-
 library/cgi/queryextension/content_length_spec.rb    | 2 +-
 library/cgi/queryextension/content_type_spec.rb      | 2 +-
 library/cgi/queryextension/cookies_spec.rb           | 2 +-
 library/cgi/queryextension/element_reference_spec.rb | 2 +-
 library/cgi/queryextension/from_spec.rb              | 2 +-
 library/cgi/queryextension/gateway_interface_spec.rb | 2 +-
 library/cgi/queryextension/has_key_spec.rb           | 2 +-
 library/cgi/queryextension/host_spec.rb              | 2 +-
 library/cgi/queryextension/include_spec.rb           | 2 +-
 library/cgi/queryextension/key_spec.rb               | 2 +-
 library/cgi/queryextension/keys_spec.rb              | 2 +-
 library/cgi/queryextension/multipart_spec.rb         | 2 +-
 library/cgi/queryextension/negotiate_spec.rb         | 2 +-
 library/cgi/queryextension/params_spec.rb            | 2 +-
 library/cgi/queryextension/path_info_spec.rb         | 2 +-
 library/cgi/queryextension/path_translated_spec.rb   | 2 +-
 library/cgi/queryextension/pragma_spec.rb            | 2 +-
 library/cgi/queryextension/query_string_spec.rb      | 2 +-
 library/cgi/queryextension/raw_cookie2_spec.rb       | 2 +-
 library/cgi/queryextension/raw_cookie_spec.rb        | 2 +-
 library/cgi/queryextension/referer_spec.rb           | 2 +-
 library/cgi/queryextension/remote_addr_spec.rb       | 2 +-
 library/cgi/queryextension/remote_host_spec.rb       | 2 +-
 library/cgi/queryextension/remote_ident_spec.rb      | 2 +-
 library/cgi/queryextension/remote_user_spec.rb       | 2 +-
 library/cgi/queryextension/request_method_spec.rb    | 2 +-
 library/cgi/queryextension/script_name_spec.rb       | 2 +-
 library/cgi/queryextension/server_name_spec.rb       | 2 +-
 library/cgi/queryextension/server_port_spec.rb       | 2 +-
 library/cgi/queryextension/server_protocol_spec.rb   | 2 +-
 library/cgi/queryextension/server_software_spec.rb   | 2 +-
 library/cgi/queryextension/user_agent_spec.rb        | 2 +-
 library/cgi/rfc1123_date_spec.rb                     | 2 +-
 library/cgi/unescapeElement_spec.rb                  | 4 ++--
 library/cgi/unescape_spec.rb                         | 4 ++--
 library/net-http/http/post_spec.rb                   | 2 +-
 library/net-http/httpgenericrequest/exec_spec.rb     | 4 ++--
 library/stringscanner/check_spec.rb                  | 4 ----
 library/stringscanner/check_until_spec.rb            | 6 ------
 library/stringscanner/exist_spec.rb                  | 4 ----
 library/stringscanner/get_byte_spec.rb               | 4 ----
 library/stringscanner/getch_spec.rb                  | 4 ----
 library/stringscanner/scan_byte_spec.rb              | 4 ----
 library/stringscanner/scan_integer_spec.rb           | 8 +-------
 library/stringscanner/scan_until_spec.rb             | 6 ------
 library/stringscanner/search_full_spec.rb            | 4 ----
 library/stringscanner/skip_until_spec.rb             | 6 ------
 optional/capi/ext/rubyspec.h                         | 4 ++--
 optional/capi/ext/set_spec.c                         | 2 +-
 optional/capi/ext/thread_spec.c                      | 4 ++--
 optional/capi/set_spec.rb                            | 2 +-
 optional/capi/string_spec.rb                         | 6 +++---
 optional/capi/thread_spec.rb                         | 2 +-
 security/cve_2020_10663_spec.rb                      | 2 +-
 shared/kernel/raise.rb                               | 4 ++--
 141 files changed, 168 insertions(+), 216 deletions(-)

diff --git a/command_line/dash_0_spec.rb b/command_line/dash_0_spec.rb
index 73c5e29004..2ce4f49b5e 100755
--- a/command_line/dash_0_spec.rb
+++ b/command_line/dash_0_spec.rb
@@ -5,7 +5,7 @@
     ruby_exe("puts $/, $-0", options: "-072").should == ":\n:\n"
   end
 
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     it "sets $/ and $-0 as a frozen string" do
       ruby_exe("puts $/.frozen?, $-0.frozen?", options: "-072").should == "true\ntrue\n"
     end
diff --git a/core/enumerable/to_set_spec.rb b/core/enumerable/to_set_spec.rb
index e0437fea61..e1fcd3a20d 100644
--- a/core/enumerable/to_set_spec.rb
+++ b/core/enumerable/to_set_spec.rb
@@ -11,7 +11,7 @@
     [1, 2, 3].to_set { |x| x * x }.should == Set[1, 4, 9]
   end
 
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     it "instantiates an object of provided as the first argument set class" do
       set = nil
       proc{set = [1, 2, 3].to_set(EnumerableSpecs::SetSubclass)}.should complain(/Enumerable#to_set/)
@@ -20,7 +20,7 @@
     end
   end
 
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     it "instantiates an object of provided as the first argument set class" do
       set = [1, 2, 3].to_set(EnumerableSpecs::SetSubclass)
       set.should be_kind_of(EnumerableSpecs::SetSubclass)
diff --git a/core/file/stat/birthtime_spec.rb b/core/file/stat/birthtime_spec.rb
index adecee15b0..9aa39297b2 100644
--- a/core/file/stat/birthtime_spec.rb
+++ b/core/file/stat/birthtime_spec.rb
@@ -1,7 +1,7 @@
 require_relative '../../../spec_helper'
 
 platform_is(:windows, :darwin, :freebsd, :netbsd,
-            *ruby_version_is("3.5") { :linux },
+            *ruby_version_is("4.0") { :linux },
            ) do
   not_implemented_messages = [
     "birthtime() function is unimplemented", # unsupported OS/version
diff --git a/core/kernel/caller_locations_spec.rb b/core/kernel/caller_locations_spec.rb
index 6074879d59..a917dba504 100644
--- a/core/kernel/caller_locations_spec.rb
+++ b/core/kernel/caller_locations_spec.rb
@@ -83,7 +83,7 @@
       end
     end
 
-    ruby_version_is "3.4"..."3.5" do
+    ruby_version_is "3.4"..."4.0" do
       it "includes core library methods defined in Ruby" do
         file, line = Kernel.instance_method(:tap).source_location
         file.should.start_with?('<internal:')
@@ -95,7 +95,7 @@
       end
     end
 
-    ruby_version_is "3.5" do
+    ruby_version_is "4.0" do
       it "does not include core library methods defined in Ruby" do
         file, line = Kernel.instance_method(:tap).source_location
         file.should.start_with?('<internal:')
diff --git a/core/kernel/caller_spec.rb b/core/kernel/caller_spec.rb
index 4bf9f7c2c2..7cd703de5a 100644
--- a/core/kernel/caller_spec.rb
+++ b/core/kernel/caller_spec.rb
@@ -84,7 +84,7 @@
   end
 
   guard -> { Kernel.instance_method(:tap).source_location } do
-    ruby_version_is ""..."3.5" do
+    ruby_version_is ""..."4.0" do
       it "includes core library methods defined in Ruby" do
         file, line = Kernel.instance_method(:tap).source_location
         file.should.start_with?('<internal:')
@@ -95,7 +95,7 @@
       end
     end
 
-    ruby_version_is "3.5" do
+    ruby_version_is "4.0" do
       it "includes core library methods defined in Ruby" do
         file, line = Kernel.instance_method(:tap).source_location
         file.should.start_with?('<internal:')
diff --git a/core/kernel/inspect_spec.rb b/core/kernel/inspect_spec.rb
index e60f7576c5..6ecf1e1c8c 100644
--- a/core/kernel/inspect_spec.rb
+++ b/core/kernel/inspect_spec.rb
@@ -29,7 +29,7 @@ class << obj
     obj.inspect.should be_kind_of(String)
   end
 
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     it "calls #instance_variables_to_inspect private method to know which variables to display" do
       obj = Object.new
       obj.instance_eval do
diff --git a/core/kernel/require_spec.rb b/core/kernel/require_spec.rb
index 81777c5313..b0e64c8bf5 100644
--- a/core/kernel/require_spec.rb
+++ b/core/kernel/require_spec.rb
@@ -17,7 +17,7 @@
   end
 
   provided = %w[complex enumerator fiber rational thread ruby2_keywords]
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     provided << "set"
     provided << "pathname"
   end
@@ -32,7 +32,7 @@
 
     features.sort.should == provided.sort
 
-    ruby_version_is "3.5" do
+    ruby_version_is "4.0" do
       provided.map! { |f| f == "pathname" ? "pathname.so" : f }
     end
 
diff --git a/core/marshal/dump_spec.rb b/core/marshal/dump_spec.rb
index 283016b8db..ff9b9214fa 100644
--- a/core/marshal/dump_spec.rb
+++ b/core/marshal/dump_spec.rb
@@ -231,7 +231,7 @@ def _dump(level)
       Marshal.dump(MarshalSpec::ClassWithOverriddenName).should == "\x04\bc)MarshalSpec::ClassWithOverriddenName"
     end
 
-    ruby_version_is "3.5" do
+    ruby_version_is "4.0" do
       it "dumps a class with multibyte characters in name" do
         source_object = eval("MarshalSpec::MultibyteぁあぃいClass".dup.force_encoding(Encoding::UTF_8))
         Marshal.dump(source_object).should == "\x04\bIc,MarshalSpec::Multibyte\xE3\x81\x81\xE3\x81\x82\xE3\x81\x83\xE3\x81\x84Class\x06:\x06ET"
@@ -261,7 +261,7 @@ def _dump(level)
       Marshal.dump(MarshalSpec::ModuleWithOverriddenName).should == "\x04\bc*MarshalSpec::ModuleWithOverriddenName"
     end
 
-    ruby_version_is "3.5" do
+    ruby_version_is "4.0" do
       it "dumps a module with multibyte characters in name" do
         source_object = eval("MarshalSpec::MultibyteけげこごModule".dup.force_encoding(Encoding::UTF_8))
         Marshal.dump(source_object).should == "\x04\bIm-MarshalSpec::Multibyte\xE3\x81\x91\xE3\x81\x92\xE3\x81\x93\xE3\x81\x94Module\x06:\x06ET"
@@ -880,7 +880,7 @@ def finalizer.noop(_)
       Marshal.dump(obj).should include("MarshalSpec::TimeWithOverriddenName")
     end
 
-    ruby_version_is "3.5" do
+    ruby_version_is "4.0" do
       it "dumps a Time subclass with multibyte characters in name" do
         source_object = eval("MarshalSpec::MultibyteぁあぃいTime".dup.force_encoding(Encoding::UTF_8))
         Marshal.dump(source_object).should == "\x04\bIc+MarshalSpec::Multibyte\xE3\x81\x81\xE3\x81\x82\xE3\x81\x83\xE3\x81\x84Time\x06:\x06ET"
diff --git a/core/method/source_location_spec.rb b/core/method/source_location_spec.rb
index 23d956ebec..1b175ebaba 100644
--- a/core/method/source_location_spec.rb
+++ b/core/method/source_location_spec.rb
@@ -109,10 +109,10 @@ def f
       eval('def self.m; end', nil, "foo", 100)
     end
     location = c.method(:m).source_location
-    ruby_version_is(""..."3.5") do
+    ruby_version_is(""..."4.0") do
       location.should == ["foo", 100]
     end
-    ruby_version_is("3.5") do
+    ruby_version_is("4.0") do
       location.should == ["foo", 100, 0, 100, 15]
     end
   end
diff --git a/core/module/ruby2_keywords_spec.rb b/core/module/ruby2_keywords_spec.rb
index 73b4ba62fa..652f9f7083 100644
--- a/core/module/ruby2_keywords_spec.rb
+++ b/core/module/ruby2_keywords_spec.rb
@@ -233,7 +233,7 @@ def obj.foo(*a, **b) end
     }.should complain(/Skipping set of ruby2_keywords flag for/)
   end
 
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     it "prints warning when a method accepts post arguments" do
       obj = Object.new
       def obj.foo(*a, b) end
diff --git a/core/module/set_temporary_name_spec.rb b/core/module/set_temporary_name_spec.rb
index 624b02c90e..46605ed675 100644
--- a/core/module/set_temporary_name_spec.rb
+++ b/core/module/set_temporary_name_spec.rb
@@ -109,7 +109,7 @@ module m::N; end
       m.name.should == "fake_name_2"
     end
 
-    ruby_bug "#21094", ""..."3.5" do
+    ruby_bug "#21094", ""..."4.0" do
       it "also updates a name of a nested module" do
         m = Module.new
         m::N = Module.new
diff --git a/core/objectspace/_id2ref_spec.rb b/core/objectspace/_id2ref_spec.rb
index 7c0e0e7a71..1ae3230bdf 100644
--- a/core/objectspace/_id2ref_spec.rb
+++ b/core/objectspace/_id2ref_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "3.5" do
+ruby_version_is "4.0" do
   describe "ObjectSpace._id2ref" do
     it "is deprecated" do
       id = nil.object_id
@@ -11,7 +11,7 @@
   end
 end
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   describe "ObjectSpace._id2ref" do
     it "converts an object id to a reference to the object" do
       s = "I am a string"
diff --git a/core/proc/ruby2_keywords_spec.rb b/core/proc/ruby2_keywords_spec.rb
index 030eeeeb68..d7f8f592e1 100644
--- a/core/proc/ruby2_keywords_spec.rb
+++ b/core/proc/ruby2_keywords_spec.rb
@@ -54,7 +54,7 @@
     }.should complain(/Skipping set of ruby2_keywords flag for/)
   end
 
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     it "prints warning when a proc accepts post arguments" do
       f = -> *a, b { }
 
diff --git a/core/proc/source_location_spec.rb b/core/proc/source_location_spec.rb
index 484466f577..69b4e2fd82 100644
--- a/core/proc/source_location_spec.rb
+++ b/core/proc/source_location_spec.rb
@@ -53,12 +53,12 @@
   end
 
   it "works even if the proc was created on the same line" do
-    ruby_version_is(""..."3.5") do
+    ruby_version_is(""..."4.0") do
       proc { true }.source_location.should == [__FILE__, __LINE__]
       Proc.new { true }.source_location.should == [__FILE__, __LINE__]
       -> { true }.source_location.should == [__FILE__, __LINE__]
     end
-    ruby_version_is("3.5") do
+    ruby_version_is("4.0") do
       proc { true }.source_location.should == [__FILE__, __LINE__, 11, __LINE__, 19]
       Proc.new { true }.source_location.should == [__FILE__, __LINE__, 15, __LINE__, 23]
       -> { true }.source_location.should == [__FILE__, __LINE__, 8, __LINE__, 17]
@@ -94,10 +94,10 @@
   it "works for eval with a given line" do
     proc = eval('-> {}', nil, "foo", 100)
     location = proc.source_location
-    ruby_version_is(""..."3.5") do
+    ruby_version_is(""..."4.0") do
       location.should == ["foo", 100]
     end
-    ruby_version_is("3.5") do
+    ruby_version_is("4.0") do
       location.should == ["foo", 100, 2, 100, 5]
     end
   end
diff --git a/core/process/status/bit_and_spec.rb b/core/process/status/bit_and_spec.rb
index 0e0edb0afa..a805364629 100644
--- a/core/process/status/bit_and_spec.rb
+++ b/core/process/status/bit_and_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
 
   describe "Process::Status#&" do
     it "returns a bitwise and of the integer status of an exited child" do
@@ -17,7 +17,7 @@
       end
     end
 
-    ruby_version_is "3.3"..."3.5" do
+    ruby_version_is "3.3"..."4.0" do
       it "raises an ArgumentError if mask is negative" do
         suppress_warning do
           ruby_exe("exit(0)")
diff --git a/core/process/status/right_shift_spec.rb b/core/process/status/right_shift_spec.rb
index a1ab75141a..355aaf4c95 100644
--- a/core/process/status/right_shift_spec.rb
+++ b/core/process/status/right_shift_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
 
   describe "Process::Status#>>" do
     it "returns a right shift of the integer status of an exited child" do
@@ -16,7 +16,7 @@
       end
     end
 
-    ruby_version_is "3.3"..."3.5" do
+    ruby_version_is "3.3"..."4.0" do
       it "raises an ArgumentError if shift value is negative" do
         suppress_warning do
           ruby_exe("exit(0)")
diff --git a/core/range/max_spec.rb b/core/range/max_spec.rb
index 8b83f69a5a..09371f5298 100644
--- a/core/range/max_spec.rb
+++ b/core/range/max_spec.rb
@@ -55,7 +55,7 @@
     (..1.0).max.should == 1.0
   end
 
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     it "raises for an exclusive beginless Integer range" do
       -> {
         (...1).max
@@ -63,7 +63,7 @@
     end
   end
 
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     it "returns the end point for exclusive beginless Integer ranges" do
       (...1).max.should == 0
     end
diff --git a/core/range/reverse_each_spec.rb b/core/range/reverse_each_spec.rb
index b51e04c3ff..56390cc0da 100644
--- a/core/range/reverse_each_spec.rb
+++ b/core/range/reverse_each_spec.rb
@@ -88,7 +88,7 @@
           (1..3).reverse_each.size.should == 3
         end
 
-        ruby_bug "#20936", "3.4"..."3.5" do
+        ruby_bug "#20936", "3.4"..."4.0" do
           it "returns Infinity when Range size is infinite" do
             (..3).reverse_each.size.should == Float::INFINITY
           end
diff --git a/core/set/compare_by_identity_spec.rb b/core/set/compare_by_identity_spec.rb
index 0dda6d79f0..238dc117a6 100644
--- a/core/set/compare_by_identity_spec.rb
+++ b/core/set/compare_by_identity_spec.rb
@@ -90,7 +90,7 @@ def o.hash; 123; end
     set.to_a.sort.should == [a1, a2].sort
   end
 
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     it "raises a FrozenError on frozen sets" do
       set = Set.new.freeze
       -> {
@@ -99,7 +99,7 @@ def o.hash; 123; end
     end
   end
 
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     it "raises a FrozenError on frozen sets" do
       set = Set.new.freeze
       -> {
diff --git a/core/set/divide_spec.rb b/core/set/divide_spec.rb
index cbe0042f16..c6c6003e99 100644
--- a/core/set/divide_spec.rb
+++ b/core/set/divide_spec.rb
@@ -25,7 +25,7 @@
     set.map{ |x| x.to_a.sort }.sort.should == [[1], [3, 4], [6], [9, 10, 11]]
   end
 
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     it "yields each two Object to the block" do
       ret = []
       Set[1, 2].divide { |x, y| ret << [x, y] }
@@ -33,7 +33,7 @@
     end
   end
 
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     it "yields each two Object to the block" do
       ret = []
       Set[1, 2].divide { |x, y| ret << [x, y] }
diff --git a/core/set/equal_value_spec.rb b/core/set/equal_value_spec.rb
index e3514928c8..721a79a3f1 100644
--- a/core/set/equal_value_spec.rb
+++ b/core/set/equal_value_spec.rb
@@ -24,7 +24,7 @@
     set1.should == set2
   end
 
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     context "when comparing to a Set-like object" do
       it "returns true when a Set and a Set-like object contain the same elements" do
         Set[1, 2, 3].should == SetSpecs::SetLike.new([1, 2, 3])
diff --git a/core/set/flatten_merge_spec.rb b/core/set/flatten_merge_spec.rb
index d7c2b30657..13cedeead9 100644
--- a/core/set/flatten_merge_spec.rb
+++ b/core/set/flatten_merge_spec.rb
@@ -1,7 +1,7 @@
 require_relative '../../spec_helper'
 
 describe "Set#flatten_merge" do
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     it "is protected" do
       Set.should have_protected_instance_method("flatten_merge")
     end
diff --git a/core/set/flatten_spec.rb b/core/set/flatten_spec.rb
index 870eccc2f1..f2cb3dfa52 100644
--- a/core/set/flatten_spec.rb
+++ b/core/set/flatten_spec.rb
@@ -16,7 +16,7 @@
     -> { set.flatten }.should raise_error(ArgumentError)
   end
 
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     context "when Set contains a Set-like object" do
       it "returns a copy of self with each included Set-like object flattened" do
         Set[SetSpecs::SetLike.new([1])].flatten.should == Set[1]
@@ -48,7 +48,7 @@
   end
 
   version_is(set_version, ""..."1.1.0") do #ruby_version_is ""..."3.3" do
-    ruby_version_is ""..."3.5" do
+    ruby_version_is ""..."4.0" do
       context "when Set contains a Set-like object" do
         it "flattens self, including Set-like objects" do
           Set[SetSpecs::SetLike.new([1])].flatten!.should == Set[1]
diff --git a/core/set/hash_spec.rb b/core/set/hash_spec.rb
index 4b4696e34c..63a0aa66a5 100644
--- a/core/set/hash_spec.rb
+++ b/core/set/hash_spec.rb
@@ -10,7 +10,7 @@
     Set[1, 2, 3].hash.should_not == Set[:a, "b", ?c].hash
   end
 
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     # see https://github.com/jruby/jruby/issues/8393
     it "is equal to nil.hash for an uninitialized Set" do
       Set.allocate.hash.should == nil.hash
diff --git a/core/set/join_spec.rb b/core/set/join_spec.rb
index cdb593597d..1c1e8a8af8 100644
--- a/core/set/join_spec.rb
+++ b/core/set/join_spec.rb
@@ -20,7 +20,7 @@
     set.join(' | ').should == "a | b | c"
   end
 
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     it "calls #to_a to convert the Set in to an Array" do
       set = Set[:a, :b, :c]
       set.should_receive(:to_a).and_return([:a, :b, :c])
diff --git a/core/set/pretty_print_cycle_spec.rb b/core/set/pretty_print_cycle_spec.rb
index d4cca515e2..7e6017c112 100644
--- a/core/set/pretty_print_cycle_spec.rb
+++ b/core/set/pretty_print_cycle_spec.rb
@@ -3,10 +3,10 @@
 describe "Set#pretty_print_cycle" do
   it "passes the 'pretty print' representation of a self-referencing Set to the pretty print writer" do
     pp = mock("PrettyPrint")
-    ruby_version_is(""..."3.5") do
+    ruby_version_is(""..."4.0") do
       pp.should_receive(:text).with("#<Set: {...}>")
     end
-    ruby_version_is("3.5") do
+    ruby_version_is("4.0") do
       pp.should_receive(:text).with("Set[...]")
     end
     Set[1, 2, 3].pretty_print_cycle(pp)
diff --git a/core/set/proper_subset_spec.rb b/core/set/proper_subset_spec.rb
index a84c4197c2..fb7848c001 100644
--- a/core/set/proper_subset_spec.rb
+++ b/core/set/proper_subset_spec.rb
@@ -34,7 +34,7 @@
   end
 
   version_is(set_version, ""..."1.1.0") do #ruby_version_is ""..."3.3" do
-    ruby_version_is ""..."3.5" do
+    ruby_version_is ""..."4.0" do
       context "when comparing to a Set-like object" do
         it "returns true if passed a Set-like object that self is a proper subset of" do
           Set[1, 2, 3].proper_subset?(SetSpecs::SetLike.new([1, 2, 3, 4])).should be_true
diff --git a/core/set/proper_superset_spec.rb b/core/set/proper_superset_spec.rb
index 653411f6b2..dc1e87e230 100644
--- a/core/set/proper_superset_spec.rb
+++ b/core/set/proper_superset_spec.rb
@@ -32,7 +32,7 @@
     -> { Set[].proper_superset?(Object.new) }.should raise_error(ArgumentError)
   end
 
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     context "when comparing to a Set-like object" do
       it "returns true if passed a Set-like object that self is a proper superset of" do
         Set[1, 2, 3, 4].proper_superset?(SetSpecs::SetLike.new([1, 2, 3])).should be_true
diff --git a/core/set/shared/inspect.rb b/core/set/shared/inspect.rb
index fbc7486acd..a90af66c98 100644
--- a/core/set/shared/inspect.rb
+++ b/core/set/shared/inspect.rb
@@ -7,13 +7,13 @@
     Set[:a, "b", Set[?c]].send(@method).should be_kind_of(String)
   end
 
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     it "does include the elements of the set" do
       Set["1"].send(@method).should == 'Set["1"]'
     end
   end
 
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     it "does include the elements of the set" do
       Set["1"].send(@method).should == '#<Set: {"1"}>'
     end
@@ -23,7 +23,7 @@
     Set["1", "2"].send(@method).should include('", "')
   end
 
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     it "correctly handles cyclic-references" do
       set1 = Set[]
       set2 = Set[set1]
@@ -33,7 +33,7 @@
     end
   end
 
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     it "correctly handles cyclic-references" do
       set1 = Set[]
       set2 = Set[set1]
diff --git a/core/set/sortedset/sortedset_spec.rb b/core/set/sortedset/sortedset_spec.rb
index 41f010e011..f3c1ec058d 100644
--- a/core/set/sortedset/sortedset_spec.rb
+++ b/core/set/sortedset/sortedset_spec.rb
@@ -1,7 +1,7 @@
 require_relative '../../../spec_helper'
 
 describe "SortedSet" do
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     it "raises error including message that it has been extracted from the set stdlib" do
       -> {
         SortedSet
diff --git a/core/set/subset_spec.rb b/core/set/subset_spec.rb
index cde61d7cd7..112bd9b38a 100644
--- a/core/set/subset_spec.rb
+++ b/core/set/subset_spec.rb
@@ -34,7 +34,7 @@
   end
 
   version_is(set_version, ""..."1.1.0") do #ruby_version_is ""..."3.3" do
-    ruby_version_is ""..."3.5" do
+    ruby_version_is ""..."4.0" do
       context "when comparing to a Set-like object" do
         it "returns true if passed a Set-like object that self is a subset of" do
           Set[1, 2, 3].subset?(SetSpecs::SetLike.new([1, 2, 3, 4])).should be_true
diff --git a/core/set/superset_spec.rb b/core/set/superset_spec.rb
index 9d7bab964a..9b3df2d047 100644
--- a/core/set/superset_spec.rb
+++ b/core/set/superset_spec.rb
@@ -32,7 +32,7 @@
     -> { Set[].superset?(Object.new) }.should raise_error(ArgumentError)
   end
 
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     context "when comparing to a Set-like object" do
       it "returns true if passed a Set-like object that self is a superset of" do
         Set[1, 2, 3, 4].superset?(SetSpecs::SetLike.new([1, 2, 3])).should be_true
diff --git a/core/unboundmethod/source_location_spec.rb b/core/unboundmethod/source_location_spec.rb
index 2391d07d99..85078ff34e 100644
--- a/core/unboundmethod/source_location_spec.rb
+++ b/core/unboundmethod/source_location_spec.rb
@@ -55,10 +55,10 @@
       eval('def m; end', nil, "foo", 100)
     end
     location = c.instance_method(:m).source_location
-    ruby_version_is(""..."3.5") do
+    ruby_version_is(""..."4.0") do
       location.should == ["foo", 100]
     end
-    ruby_version_is("3.5") do
+    ruby_version_is("4.0") do
       location.should == ["foo", 100, 0, 100, 10]
     end
   end
diff --git a/language/numbered_parameters_spec.rb b/language/numbered_parameters_spec.rb
index 39ddd6fee8..de532c326d 100644
--- a/language/numbered_parameters_spec.rb
+++ b/language/numbered_parameters_spec.rb
@@ -90,14 +90,14 @@
     proc { _2 }.parameters.should == [[:opt, :_1], [:opt, :_2]]
   end
 
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     it "affects binding local variables" do
       -> { _1; binding.local_variables }.call("a").should == [:_1]
       -> { _2; binding.local_variables }.call("a", "b").should == [:_1, :_2]
     end
   end
 
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     it "does not affect binding local variables" do
       -> { _1; binding.local_variables }.call("a").should == []
       -> { _2; binding.local_variables }.call("a", "b").should == []
diff --git a/language/predefined_spec.rb b/language/predefined_spec.rb
index d90e19858a..f2488615aa 100644
--- a/language/predefined_spec.rb
+++ b/language/predefined_spec.rb
@@ -687,7 +687,7 @@ def foo
     $VERBOSE = @verbose
   end
 
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     it "can be assigned a String" do
       str = +"abc"
       $/ = str
@@ -695,7 +695,7 @@ def foo
     end
   end
 
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     it "makes a new frozen String from the assigned String" do
       string_subclass = Class.new(String)
       str = string_subclass.new("abc")
@@ -763,7 +763,7 @@ def foo
     $VERBOSE = @verbose
   end
 
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     it "can be assigned a String" do
       str = +"abc"
       $-0 = str
@@ -771,7 +771,7 @@ def foo
     end
   end
 
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     it "makes a new frozen String from the assigned String" do
       string_subclass = Class.new(String)
       str = string_subclass.new("abc")
diff --git a/language/regexp_spec.rb b/language/regexp_spec.rb
index dbf341b19e..ce344b5b05 100644
--- a/language/regexp_spec.rb
+++ b/language/regexp_spec.rb
@@ -112,7 +112,7 @@
     /foo.(?<=\d)/.match("fooA foo1").to_a.should == ["foo1"]
   end
 
-  ruby_bug "#13671", ""..."3.5" do # https://bugs.ruby-lang.org/issues/13671
+  ruby_bug "#13671", ""..."4.0" do # https://bugs.ruby-lang.org/issues/13671
     it "handles a lookbehind with ss characters" do
       r =  Regexp.new("(?<!dss)", Regexp::IGNORECASE)
       r.should =~ "✨"
diff --git a/language/send_spec.rb b/language/send_spec.rb
index bd69593d76..5d6340ffc5 100644
--- a/language/send_spec.rb
+++ b/language/send_spec.rb
@@ -106,7 +106,7 @@
     specs.yield_now(&o).should == :from_to_proc
   end
 
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     it "raises TypeError if 'to_proc' doesn't return a Proc" do
       o = LangSendSpecs::RawToProc.new(42)
 
diff --git a/language/variables_spec.rb b/language/variables_spec.rb
index eb080eea55..e134271939 100644
--- a/language/variables_spec.rb
+++ b/language/variables_spec.rb
@@ -363,7 +363,7 @@ module VariableSpecs
       a.should == []
     end
 
-    ruby_version_is "3.5" do
+    ruby_version_is "4.0" do
       it "converts nil to empty array without calling a method" do
         nil.should_not_receive(:to_a)
 
@@ -372,7 +372,7 @@ module VariableSpecs
       end
     end
 
-    ruby_version_is ""..."3.5"  do
+    ruby_version_is ""..."4.0"  do
       it "calls #to_a to convert nil to an empty Array" do
         nil.should_receive(:to_a).and_return([])
 
diff --git a/library/cgi/cookie/domain_spec.rb b/library/cgi/cookie/domain_spec.rb
index 622549039f..0ed56d6d61 100644
--- a/library/cgi/cookie/domain_spec.rb
+++ b/library/cgi/cookie/domain_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::Cookie#domain" do
diff --git a/library/cgi/cookie/expires_spec.rb b/library/cgi/cookie/expires_spec.rb
index df52a6f41e..c5b2c4faf9 100644
--- a/library/cgi/cookie/expires_spec.rb
+++ b/library/cgi/cookie/expires_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::Cookie#expires" do
diff --git a/library/cgi/cookie/initialize_spec.rb b/library/cgi/cookie/initialize_spec.rb
index ac99d5e4fd..248f35e78b 100644
--- a/library/cgi/cookie/initialize_spec.rb
+++ b/library/cgi/cookie/initialize_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::Cookie#initialize when passed String" do
diff --git a/library/cgi/cookie/name_spec.rb b/library/cgi/cookie/name_spec.rb
index 712628180b..4908204e8a 100644
--- a/library/cgi/cookie/name_spec.rb
+++ b/library/cgi/cookie/name_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::Cookie#name" do
diff --git a/library/cgi/cookie/parse_spec.rb b/library/cgi/cookie/parse_spec.rb
index ecc78d77dc..bc505c37ba 100644
--- a/library/cgi/cookie/parse_spec.rb
+++ b/library/cgi/cookie/parse_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::Cookie.parse" do
diff --git a/library/cgi/cookie/path_spec.rb b/library/cgi/cookie/path_spec.rb
index 010e87a6b8..13ee5d726b 100644
--- a/library/cgi/cookie/path_spec.rb
+++ b/library/cgi/cookie/path_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::Cookie#path" do
diff --git a/library/cgi/cookie/secure_spec.rb b/library/cgi/cookie/secure_spec.rb
index b526897250..cb38c8c2e0 100644
--- a/library/cgi/cookie/secure_spec.rb
+++ b/library/cgi/cookie/secure_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::Cookie#secure" do
diff --git a/library/cgi/cookie/to_s_spec.rb b/library/cgi/cookie/to_s_spec.rb
index 34326f672b..20d2579f8d 100644
--- a/library/cgi/cookie/to_s_spec.rb
+++ b/library/cgi/cookie/to_s_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::Cookie#to_s" do
diff --git a/library/cgi/cookie/value_spec.rb b/library/cgi/cookie/value_spec.rb
index e7c91b55b9..672653d7f4 100644
--- a/library/cgi/cookie/value_spec.rb
+++ b/library/cgi/cookie/value_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::Cookie#value" do
diff --git a/library/cgi/escapeElement_spec.rb b/library/cgi/escapeElement_spec.rb
index 7bfa3f4feb..72c38d6028 100644
--- a/library/cgi/escapeElement_spec.rb
+++ b/library/cgi/escapeElement_spec.rb
@@ -1,9 +1,9 @@
 require_relative '../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 end
-ruby_version_is "3.5" do
+ruby_version_is "4.0" do
   require 'cgi/escape'
 end
 
diff --git a/library/cgi/htmlextension/a_spec.rb b/library/cgi/htmlextension/a_spec.rb
index 16a0552bac..78d3dec8fa 100644
--- a/library/cgi/htmlextension/a_spec.rb
+++ b/library/cgi/htmlextension/a_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/base_spec.rb b/library/cgi/htmlextension/base_spec.rb
index a4c4a61614..1eedfdea54 100644
--- a/library/cgi/htmlextension/base_spec.rb
+++ b/library/cgi/htmlextension/base_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/blockquote_spec.rb b/library/cgi/htmlextension/blockquote_spec.rb
index f8d4ca310e..883e36f78b 100644
--- a/library/cgi/htmlextension/blockquote_spec.rb
+++ b/library/cgi/htmlextension/blockquote_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/br_spec.rb b/library/cgi/htmlextension/br_spec.rb
index 45909a2db7..23c2cb4a48 100644
--- a/library/cgi/htmlextension/br_spec.rb
+++ b/library/cgi/htmlextension/br_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/caption_spec.rb b/library/cgi/htmlextension/caption_spec.rb
index 74f0a098f4..3d3e21ecaa 100644
--- a/library/cgi/htmlextension/caption_spec.rb
+++ b/library/cgi/htmlextension/caption_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/checkbox_group_spec.rb b/library/cgi/htmlextension/checkbox_group_spec.rb
index 1acfe62fda..07163c010e 100644
--- a/library/cgi/htmlextension/checkbox_group_spec.rb
+++ b/library/cgi/htmlextension/checkbox_group_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/checkbox_spec.rb b/library/cgi/htmlextension/checkbox_spec.rb
index ba410f31de..ad87b78061 100644
--- a/library/cgi/htmlextension/checkbox_spec.rb
+++ b/library/cgi/htmlextension/checkbox_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/doctype_spec.rb b/library/cgi/htmlextension/doctype_spec.rb
index 49501ac8f7..02af831855 100644
--- a/library/cgi/htmlextension/doctype_spec.rb
+++ b/library/cgi/htmlextension/doctype_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/file_field_spec.rb b/library/cgi/htmlextension/file_field_spec.rb
index b8ef0b2045..eff077b9a2 100644
--- a/library/cgi/htmlextension/file_field_spec.rb
+++ b/library/cgi/htmlextension/file_field_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/form_spec.rb b/library/cgi/htmlextension/form_spec.rb
index 510ce27b77..55ac63152b 100644
--- a/library/cgi/htmlextension/form_spec.rb
+++ b/library/cgi/htmlextension/form_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/frame_spec.rb b/library/cgi/htmlextension/frame_spec.rb
index 0dc30e94f7..fef40849eb 100644
--- a/library/cgi/htmlextension/frame_spec.rb
+++ b/library/cgi/htmlextension/frame_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require_relative 'fixtures/common'
   require 'cgi'
 
diff --git a/library/cgi/htmlextension/frameset_spec.rb b/library/cgi/htmlextension/frameset_spec.rb
index a37b5f537d..3ad0a9c4d2 100644
--- a/library/cgi/htmlextension/frameset_spec.rb
+++ b/library/cgi/htmlextension/frameset_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require_relative 'fixtures/common'
   require 'cgi'
 
diff --git a/library/cgi/htmlextension/hidden_spec.rb b/library/cgi/htmlextension/hidden_spec.rb
index 5771058fa3..b2323775f6 100644
--- a/library/cgi/htmlextension/hidden_spec.rb
+++ b/library/cgi/htmlextension/hidden_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/html_spec.rb b/library/cgi/htmlextension/html_spec.rb
index 0e4052dcc4..60a10fb6b4 100644
--- a/library/cgi/htmlextension/html_spec.rb
+++ b/library/cgi/htmlextension/html_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/image_button_spec.rb b/library/cgi/htmlextension/image_button_spec.rb
index cd7f1ae4f7..f8770119d4 100644
--- a/library/cgi/htmlextension/image_button_spec.rb
+++ b/library/cgi/htmlextension/image_button_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/img_spec.rb b/library/cgi/htmlextension/img_spec.rb
index 193d3dca26..a05cfdea48 100644
--- a/library/cgi/htmlextension/img_spec.rb
+++ b/library/cgi/htmlextension/img_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/multipart_form_spec.rb b/library/cgi/htmlextension/multipart_form_spec.rb
index e5c16f2475..ee1c45b84e 100644
--- a/library/cgi/htmlextension/multipart_form_spec.rb
+++ b/library/cgi/htmlextension/multipart_form_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/password_field_spec.rb b/library/cgi/htmlextension/password_field_spec.rb
index a462bea015..0fefdd5c45 100644
--- a/library/cgi/htmlextension/password_field_spec.rb
+++ b/library/cgi/htmlextension/password_field_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/popup_menu_spec.rb b/library/cgi/htmlextension/popup_menu_spec.rb
index 0ec85e96df..7452d15317 100644
--- a/library/cgi/htmlextension/popup_menu_spec.rb
+++ b/library/cgi/htmlextension/popup_menu_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
   require_relative 'shared/popup_menu'
diff --git a/library/cgi/htmlextension/radio_button_spec.rb b/library/cgi/htmlextension/radio_button_spec.rb
index 865c16d232..8458685cdc 100644
--- a/library/cgi/htmlextension/radio_button_spec.rb
+++ b/library/cgi/htmlextension/radio_button_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/radio_group_spec.rb b/library/cgi/htmlextension/radio_group_spec.rb
index 7381e7183b..fd925a5165 100644
--- a/library/cgi/htmlextension/radio_group_spec.rb
+++ b/library/cgi/htmlextension/radio_group_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/reset_spec.rb b/library/cgi/htmlextension/reset_spec.rb
index d3a5c801fa..80e4441b16 100644
--- a/library/cgi/htmlextension/reset_spec.rb
+++ b/library/cgi/htmlextension/reset_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/scrolling_list_spec.rb b/library/cgi/htmlextension/scrolling_list_spec.rb
index aab52d7409..b565444679 100644
--- a/library/cgi/htmlextension/scrolling_list_spec.rb
+++ b/library/cgi/htmlextension/scrolling_list_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require_relative 'fixtures/common'
   require 'cgi'
   require_relative 'shared/popup_menu'
diff --git a/library/cgi/htmlextension/submit_spec.rb b/library/cgi/htmlextension/submit_spec.rb
index 3401b10356..bb6e079c4e 100644
--- a/library/cgi/htmlextension/submit_spec.rb
+++ b/library/cgi/htmlextension/submit_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/text_field_spec.rb b/library/cgi/htmlextension/text_field_spec.rb
index 4f63dbce59..37e13e3746 100644
--- a/library/cgi/htmlextension/text_field_spec.rb
+++ b/library/cgi/htmlextension/text_field_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/htmlextension/textarea_spec.rb b/library/cgi/htmlextension/textarea_spec.rb
index a3881796fd..99c6d3dd2d 100644
--- a/library/cgi/htmlextension/textarea_spec.rb
+++ b/library/cgi/htmlextension/textarea_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'fixtures/common'
 
diff --git a/library/cgi/http_header_spec.rb b/library/cgi/http_header_spec.rb
index 173055718b..8d9f3fe9b8 100644
--- a/library/cgi/http_header_spec.rb
+++ b/library/cgi/http_header_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   require_relative 'shared/http_header'
diff --git a/library/cgi/initialize_spec.rb b/library/cgi/initialize_spec.rb
index d46b5a3564..b8ecf5cac2 100644
--- a/library/cgi/initialize_spec.rb
+++ b/library/cgi/initialize_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI#initialize" do
diff --git a/library/cgi/out_spec.rb b/library/cgi/out_spec.rb
index c79d000284..733e656ea1 100644
--- a/library/cgi/out_spec.rb
+++ b/library/cgi/out_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI#out" do
diff --git a/library/cgi/parse_spec.rb b/library/cgi/parse_spec.rb
index d35d0d3365..f09270c195 100644
--- a/library/cgi/parse_spec.rb
+++ b/library/cgi/parse_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI.parse when passed String" do
diff --git a/library/cgi/pretty_spec.rb b/library/cgi/pretty_spec.rb
index 1fed3bbd2e..9df1611037 100644
--- a/library/cgi/pretty_spec.rb
+++ b/library/cgi/pretty_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI.pretty when passed html" do
diff --git a/library/cgi/print_spec.rb b/library/cgi/print_spec.rb
index 5057c280a0..f4f461c5c0 100644
--- a/library/cgi/print_spec.rb
+++ b/library/cgi/print_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI#print" do
diff --git a/library/cgi/queryextension/accept_charset_spec.rb b/library/cgi/queryextension/accept_charset_spec.rb
index 9bfc833a3b..be05f0c175 100644
--- a/library/cgi/queryextension/accept_charset_spec.rb
+++ b/library/cgi/queryextension/accept_charset_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#accept_charset" do
diff --git a/library/cgi/queryextension/accept_encoding_spec.rb b/library/cgi/queryextension/accept_encoding_spec.rb
index f0d7f2058a..42eb4a49b5 100644
--- a/library/cgi/queryextension/accept_encoding_spec.rb
+++ b/library/cgi/queryextension/accept_encoding_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#accept_encoding" do
diff --git a/library/cgi/queryextension/accept_language_spec.rb b/library/cgi/queryextension/accept_language_spec.rb
index e3dfcd0324..19f29c6345 100644
--- a/library/cgi/queryextension/accept_language_spec.rb
+++ b/library/cgi/queryextension/accept_language_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#accept_language" do
diff --git a/library/cgi/queryextension/accept_spec.rb b/library/cgi/queryextension/accept_spec.rb
index 9370a885a4..dcae39a736 100644
--- a/library/cgi/queryextension/accept_spec.rb
+++ b/library/cgi/queryextension/accept_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#accept" do
diff --git a/library/cgi/queryextension/auth_type_spec.rb b/library/cgi/queryextension/auth_type_spec.rb
index c858436037..75e9cdb27a 100644
--- a/library/cgi/queryextension/auth_type_spec.rb
+++ b/library/cgi/queryextension/auth_type_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#auth_type" do
diff --git a/library/cgi/queryextension/cache_control_spec.rb b/library/cgi/queryextension/cache_control_spec.rb
index d42421126c..c4b727e671 100644
--- a/library/cgi/queryextension/cache_control_spec.rb
+++ b/library/cgi/queryextension/cache_control_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#cache_control" do
diff --git a/library/cgi/queryextension/content_length_spec.rb b/library/cgi/queryextension/content_length_spec.rb
index 2e3dca6f58..a8b87e148c 100644
--- a/library/cgi/queryextension/content_length_spec.rb
+++ b/library/cgi/queryextension/content_length_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#content_length" do
diff --git a/library/cgi/queryextension/content_type_spec.rb b/library/cgi/queryextension/content_type_spec.rb
index ce1be28571..d3cbdf0b14 100644
--- a/library/cgi/queryextension/content_type_spec.rb
+++ b/library/cgi/queryextension/content_type_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#content_type" do
diff --git a/library/cgi/queryextension/cookies_spec.rb b/library/cgi/queryextension/cookies_spec.rb
index 029ad5991a..266fe0c721 100644
--- a/library/cgi/queryextension/cookies_spec.rb
+++ b/library/cgi/queryextension/cookies_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#cookies" do
diff --git a/library/cgi/queryextension/element_reference_spec.rb b/library/cgi/queryextension/element_reference_spec.rb
index df1c372ab7..0b57387efc 100644
--- a/library/cgi/queryextension/element_reference_spec.rb
+++ b/library/cgi/queryextension/element_reference_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#[]" do
diff --git a/library/cgi/queryextension/from_spec.rb b/library/cgi/queryextension/from_spec.rb
index 8d278f5318..b341e0be10 100644
--- a/library/cgi/queryextension/from_spec.rb
+++ b/library/cgi/queryextension/from_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#from" do
diff --git a/library/cgi/queryextension/gateway_interface_spec.rb b/library/cgi/queryextension/gateway_interface_spec.rb
index d519b80e32..c82522326b 100644
--- a/library/cgi/queryextension/gateway_interface_spec.rb
+++ b/library/cgi/queryextension/gateway_interface_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#gateway_interface" do
diff --git a/library/cgi/queryextension/has_key_spec.rb b/library/cgi/queryextension/has_key_spec.rb
index 5892ecaf77..43f7aae1b2 100644
--- a/library/cgi/queryextension/has_key_spec.rb
+++ b/library/cgi/queryextension/has_key_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'shared/has_key'
 
diff --git a/library/cgi/queryextension/host_spec.rb b/library/cgi/queryextension/host_spec.rb
index 2eaf1330c0..e1047c942b 100644
--- a/library/cgi/queryextension/host_spec.rb
+++ b/library/cgi/queryextension/host_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#host" do
diff --git a/library/cgi/queryextension/include_spec.rb b/library/cgi/queryextension/include_spec.rb
index 18520c4aaf..7275c309f9 100644
--- a/library/cgi/queryextension/include_spec.rb
+++ b/library/cgi/queryextension/include_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'shared/has_key'
 
diff --git a/library/cgi/queryextension/key_spec.rb b/library/cgi/queryextension/key_spec.rb
index c8c5870eba..dc2f52fbe0 100644
--- a/library/cgi/queryextension/key_spec.rb
+++ b/library/cgi/queryextension/key_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require_relative 'shared/has_key'
 
diff --git a/library/cgi/queryextension/keys_spec.rb b/library/cgi/queryextension/keys_spec.rb
index 0c35404103..bb16914065 100644
--- a/library/cgi/queryextension/keys_spec.rb
+++ b/library/cgi/queryextension/keys_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#keys" do
diff --git a/library/cgi/queryextension/multipart_spec.rb b/library/cgi/queryextension/multipart_spec.rb
index 72c8073a5a..281791892c 100644
--- a/library/cgi/queryextension/multipart_spec.rb
+++ b/library/cgi/queryextension/multipart_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
   require "stringio"
 
diff --git a/library/cgi/queryextension/negotiate_spec.rb b/library/cgi/queryextension/negotiate_spec.rb
index c159c6cfe2..4083e6a8cd 100644
--- a/library/cgi/queryextension/negotiate_spec.rb
+++ b/library/cgi/queryextension/negotiate_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#negotiate" do
diff --git a/library/cgi/queryextension/params_spec.rb b/library/cgi/queryextension/params_spec.rb
index e8b447f227..938028ea14 100644
--- a/library/cgi/queryextension/params_spec.rb
+++ b/library/cgi/queryextension/params_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#params" do
diff --git a/library/cgi/queryextension/path_info_spec.rb b/library/cgi/queryextension/path_info_spec.rb
index 9054f1cfd3..9b7834c514 100644
--- a/library/cgi/queryextension/path_info_spec.rb
+++ b/library/cgi/queryextension/path_info_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#path_info" do
diff --git a/library/cgi/queryextension/path_translated_spec.rb b/library/cgi/queryextension/path_translated_spec.rb
index 4b17f6c01b..a773aaafdb 100644
--- a/library/cgi/queryextension/path_translated_spec.rb
+++ b/library/cgi/queryextension/path_translated_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#path_translated" do
diff --git a/library/cgi/queryextension/pragma_spec.rb b/library/cgi/queryextension/pragma_spec.rb
index c6a9c5b973..be384182a5 100644
--- a/library/cgi/queryextension/pragma_spec.rb
+++ b/library/cgi/queryextension/pragma_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#pragma" do
diff --git a/library/cgi/queryextension/query_string_spec.rb b/library/cgi/queryextension/query_string_spec.rb
index ef3cb9c8fb..64fbeaea10 100644
--- a/library/cgi/queryextension/query_string_spec.rb
+++ b/library/cgi/queryextension/query_string_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#query_string" do
diff --git a/library/cgi/queryextension/raw_cookie2_spec.rb b/library/cgi/queryextension/raw_cookie2_spec.rb
index 07ef00e8c5..30d314aca1 100644
--- a/library/cgi/queryextension/raw_cookie2_spec.rb
+++ b/library/cgi/queryextension/raw_cookie2_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#raw_cookie2" do
diff --git a/library/cgi/queryextension/raw_cookie_spec.rb b/library/cgi/queryextension/raw_cookie_spec.rb
index f1ebb8ad82..affa504b39 100644
--- a/library/cgi/queryextension/raw_cookie_spec.rb
+++ b/library/cgi/queryextension/raw_cookie_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#raw_cookie" do
diff --git a/library/cgi/queryextension/referer_spec.rb b/library/cgi/queryextension/referer_spec.rb
index 737253eac9..53fc19ddd0 100644
--- a/library/cgi/queryextension/referer_spec.rb
+++ b/library/cgi/queryextension/referer_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#referer" do
diff --git a/library/cgi/queryextension/remote_addr_spec.rb b/library/cgi/queryextension/remote_addr_spec.rb
index e2cc696ae2..7b5addc2d5 100644
--- a/library/cgi/queryextension/remote_addr_spec.rb
+++ b/library/cgi/queryextension/remote_addr_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#remote_addr" do
diff --git a/library/cgi/queryextension/remote_host_spec.rb b/library/cgi/queryextension/remote_host_spec.rb
index c4db9e4ffe..2dfe59ca38 100644
--- a/library/cgi/queryextension/remote_host_spec.rb
+++ b/library/cgi/queryextension/remote_host_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#remote_host" do
diff --git a/library/cgi/queryextension/remote_ident_spec.rb b/library/cgi/queryextension/remote_ident_spec.rb
index d507b7d7be..bb05fc7942 100644
--- a/library/cgi/queryextension/remote_ident_spec.rb
+++ b/library/cgi/queryextension/remote_ident_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#remote_ident" do
diff --git a/library/cgi/queryextension/remote_user_spec.rb b/library/cgi/queryextension/remote_user_spec.rb
index ceee410797..29856302ab 100644
--- a/library/cgi/queryextension/remote_user_spec.rb
+++ b/library/cgi/queryextension/remote_user_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#remote_user" do
diff --git a/library/cgi/queryextension/request_method_spec.rb b/library/cgi/queryextension/request_method_spec.rb
index b540280261..7331b134d2 100644
--- a/library/cgi/queryextension/request_method_spec.rb
+++ b/library/cgi/queryextension/request_method_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#request_method" do
diff --git a/library/cgi/queryextension/script_name_spec.rb b/library/cgi/queryextension/script_name_spec.rb
index 49a7847eff..4b359a545f 100644
--- a/library/cgi/queryextension/script_name_spec.rb
+++ b/library/cgi/queryextension/script_name_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#script_name" do
diff --git a/library/cgi/queryextension/server_name_spec.rb b/library/cgi/queryextension/server_name_spec.rb
index ee5d754ad3..c1f7fb4c54 100644
--- a/library/cgi/queryextension/server_name_spec.rb
+++ b/library/cgi/queryextension/server_name_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#server_name" do
diff --git a/library/cgi/queryextension/server_port_spec.rb b/library/cgi/queryextension/server_port_spec.rb
index c4f8df78cf..60c03ea639 100644
--- a/library/cgi/queryextension/server_port_spec.rb
+++ b/library/cgi/queryextension/server_port_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#server_port" do
diff --git a/library/cgi/queryextension/server_protocol_spec.rb b/library/cgi/queryextension/server_protocol_spec.rb
index 35d3b8add1..fdbcc2108f 100644
--- a/library/cgi/queryextension/server_protocol_spec.rb
+++ b/library/cgi/queryextension/server_protocol_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#server_protocol" do
diff --git a/library/cgi/queryextension/server_software_spec.rb b/library/cgi/queryextension/server_software_spec.rb
index d4fcceb379..c5811a2268 100644
--- a/library/cgi/queryextension/server_software_spec.rb
+++ b/library/cgi/queryextension/server_software_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#server_software" do
diff --git a/library/cgi/queryextension/user_agent_spec.rb b/library/cgi/queryextension/user_agent_spec.rb
index 070a779123..3240352ef6 100644
--- a/library/cgi/queryextension/user_agent_spec.rb
+++ b/library/cgi/queryextension/user_agent_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI::QueryExtension#user_agent" do
diff --git a/library/cgi/rfc1123_date_spec.rb b/library/cgi/rfc1123_date_spec.rb
index 2641b40e94..636185f22c 100644
--- a/library/cgi/rfc1123_date_spec.rb
+++ b/library/cgi/rfc1123_date_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 
   describe "CGI.rfc1123_date when passed Time" do
diff --git a/library/cgi/unescapeElement_spec.rb b/library/cgi/unescapeElement_spec.rb
index af2fa8a47d..db83f0d2fb 100644
--- a/library/cgi/unescapeElement_spec.rb
+++ b/library/cgi/unescapeElement_spec.rb
@@ -1,9 +1,9 @@
 require_relative '../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 end
-ruby_version_is "3.5" do
+ruby_version_is "4.0" do
   require 'cgi/escape'
 end
 
diff --git a/library/cgi/unescape_spec.rb b/library/cgi/unescape_spec.rb
index e750c72921..aa731b9367 100644
--- a/library/cgi/unescape_spec.rb
+++ b/library/cgi/unescape_spec.rb
@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
 require_relative '../../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'cgi'
 end
-ruby_version_is "3.5" do
+ruby_version_is "4.0" do
   require 'cgi/escape'
 end
 
diff --git a/library/net-http/http/post_spec.rb b/library/net-http/http/post_spec.rb
index cebbee4ff3..b8b8d16ad1 100644
--- a/library/net-http/http/post_spec.rb
+++ b/library/net-http/http/post_spec.rb
@@ -25,7 +25,7 @@
     response.should be_kind_of(Net::HTTPResponse)
   end
 
-  ruby_version_is ""..."3.5" do
+  ruby_version_is ""..."4.0" do
     it "sends Content-Type: application/x-www-form-urlencoded by default" do
       response = Net::HTTP.post(URI("http://localhost:#{NetHTTPSpecs.port}/request/header"), "test=test")
       response.body.should include({ "Content-Type" => "application/x-www-form-urlencoded" }.inspect.delete("{}"))
diff --git a/library/net-http/httpgenericrequest/exec_spec.rb b/library/net-http/httpgenericrequest/exec_spec.rb
index 0912e5a71f..a09f9d5bec 100644
--- a/library/net-http/httpgenericrequest/exec_spec.rb
+++ b/library/net-http/httpgenericrequest/exec_spec.rb
@@ -31,7 +31,7 @@
   end
 
   describe "when a request body is set" do
-    ruby_version_is ""..."3.5" do
+    ruby_version_is ""..."4.0" do
       it "sets the 'Content-Type' header to 'application/x-www-form-urlencoded' unless the 'Content-Type' header is supplied" do
         request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path")
         request.body = "Some Content"
@@ -64,7 +64,7 @@
   end
 
   describe "when a body stream is set" do
-    ruby_version_is ""..."3.5" do
+    ruby_version_is ""..."4.0" do
       it "sets the 'Content-Type' header to 'application/x-www-form-urlencoded' unless the 'Content-Type' header is supplied" do
         request = Net::HTTPGenericRequest.new("POST", true, true, "/some/path",
                                               "Content-Length" => "10")
diff --git a/library/stringscanner/check_spec.rb b/library/stringscanner/check_spec.rb
index 235f2f22e9..5e855e154a 100644
--- a/library/stringscanner/check_spec.rb
+++ b/library/stringscanner/check_spec.rb
@@ -39,7 +39,6 @@
 
     context "when #check was called with a String pattern" do
       # https://github.com/ruby/strscan/issues/139
-      ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
       version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
         it "returns nil when matching succeeded" do
           @s.check("This")
@@ -47,7 +46,6 @@
           @s[:a].should be_nil
         end
       end
-      end
       version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
         it "raises IndexError when matching succeeded" do
           @s.check("This")
@@ -68,7 +66,6 @@
       end
 
       # https://github.com/ruby/strscan/issues/135
-      ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
       version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
         it "ignores the previous matching with Regexp" do
           @s.exist?(/(?<a>This)/)
@@ -80,7 +77,6 @@
           @s[:a].should be_nil
         end
       end
-      end
       version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
         it "ignores the previous matching with Regexp" do
           @s.exist?(/(?<a>This)/)
diff --git a/library/stringscanner/check_until_spec.rb b/library/stringscanner/check_until_spec.rb
index 701a703ebe..582da66b37 100644
--- a/library/stringscanner/check_until_spec.rb
+++ b/library/stringscanner/check_until_spec.rb
@@ -35,7 +35,6 @@
     end
 
     # https://github.com/ruby/strscan/issues/131
-    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
     version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.1"
       it "sets the last match result if given a String" do
         @s.check_until("a")
@@ -45,7 +44,6 @@
         @s.post_match.should == " test"
       end
     end
-    end
 
     version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
       it "sets the last match result if given a String" do
@@ -76,7 +74,6 @@
     version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
       context "when #check_until was called with a String pattern" do
         # https://github.com/ruby/strscan/issues/139
-        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
         version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
           it "returns nil when matching succeeded" do
             @s.check_until("This")
@@ -84,7 +81,6 @@
             @s[:a].should be_nil
           end
         end
-        end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
           it "raises IndexError when matching succeeded" do
             @s.check_until("This")
@@ -105,7 +101,6 @@
         end
 
         # https://github.com/ruby/strscan/issues/135
-        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
         version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
           it "ignores the previous matching with Regexp" do
             @s.exist?(/(?<a>This)/)
@@ -117,7 +112,6 @@
             @s[:a].should be_nil
           end
         end
-        end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
           it "ignores the previous matching with Regexp" do
             @s.exist?(/(?<a>This)/)
diff --git a/library/stringscanner/exist_spec.rb b/library/stringscanner/exist_spec.rb
index 3f40c7a5a5..a408fd0b8d 100644
--- a/library/stringscanner/exist_spec.rb
+++ b/library/stringscanner/exist_spec.rb
@@ -64,7 +64,6 @@
     version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
       context "when #exist? was called with a String pattern" do
         # https://github.com/ruby/strscan/issues/139
-        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
         version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
           it "returns nil when matching succeeded" do
             @s.exist?("This")
@@ -72,7 +71,6 @@
             @s[:a].should be_nil
           end
         end
-        end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
           it "raises IndexError when matching succeeded" do
             @s.exist?("This")
@@ -93,7 +91,6 @@
         end
 
         # https://github.com/ruby/strscan/issues/135
-        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
         version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
           it "ignores the previous matching with Regexp" do
             @s.exist?(/(?<a>This)/)
@@ -105,7 +102,6 @@
             @s[:a].should be_nil
           end
         end
-        end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
           it "ignores the previous matching with Regexp" do
             @s.exist?(/(?<a>This)/)
diff --git a/library/stringscanner/get_byte_spec.rb b/library/stringscanner/get_byte_spec.rb
index b3c2b7f678..144859abc9 100644
--- a/library/stringscanner/get_byte_spec.rb
+++ b/library/stringscanner/get_byte_spec.rb
@@ -32,7 +32,6 @@
 
   describe "#[] successive call with a capture group name" do
     # https://github.com/ruby/strscan/issues/139
-    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
     version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
       it "returns nil" do
         s = StringScanner.new("This is a test")
@@ -41,7 +40,6 @@
         s[:a].should be_nil
       end
     end
-    end
     version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
       it "raises IndexError" do
         s = StringScanner.new("This is a test")
@@ -58,7 +56,6 @@
     end
 
     # https://github.com/ruby/strscan/issues/135
-    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
     version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
       it "ignores the previous matching with Regexp" do
         s = StringScanner.new("This is a test")
@@ -71,7 +68,6 @@
         s[:a].should be_nil
       end
     end
-    end
     version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
       it "ignores the previous matching with Regexp" do
         s = StringScanner.new("This is a test")
diff --git a/library/stringscanner/getch_spec.rb b/library/stringscanner/getch_spec.rb
index c9c3eb6fd3..d369391b14 100644
--- a/library/stringscanner/getch_spec.rb
+++ b/library/stringscanner/getch_spec.rb
@@ -33,7 +33,6 @@
 
   describe "#[] successive call with a capture group name" do
     # https://github.com/ruby/strscan/issues/139
-    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
     version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
       it "returns nil" do
         s = StringScanner.new("This is a test")
@@ -42,7 +41,6 @@
         s[:a].should be_nil
       end
     end
-    end
     version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
       it "raises IndexError" do
         s = StringScanner.new("This is a test")
@@ -59,7 +57,6 @@
     end
 
     # https://github.com/ruby/strscan/issues/135
-    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
     version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
       it "ignores the previous matching with Regexp" do
         s = StringScanner.new("This is a test")
@@ -73,7 +70,6 @@
         s[:a].should be_nil
       end
     end
-    end
     version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
       it "ignores the previous matching with Regexp" do
         s = StringScanner.new("This is a test")
diff --git a/library/stringscanner/scan_byte_spec.rb b/library/stringscanner/scan_byte_spec.rb
index c60e22be4f..aa2decc8f7 100644
--- a/library/stringscanner/scan_byte_spec.rb
+++ b/library/stringscanner/scan_byte_spec.rb
@@ -43,7 +43,6 @@
 
     describe "#[] successive call with a capture group name" do
       # https://github.com/ruby/strscan/issues/139
-      ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
       version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
         it "returns nil" do
           s = StringScanner.new("abc")
@@ -52,7 +51,6 @@
           s[:a].should be_nil
         end
       end
-      end
       version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
         it "raises IndexError" do
           s = StringScanner.new("abc")
@@ -69,7 +67,6 @@
       end
 
       # https://github.com/ruby/strscan/issues/135
-      ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
       version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
         it "ignores the previous matching with Regexp" do
           s = StringScanner.new("abc")
@@ -83,7 +80,6 @@
           s[:a].should == nil
         end
       end
-      end
       version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
         it "ignores the previous matching with Regexp" do
           s = StringScanner.new("abc")
diff --git a/library/stringscanner/scan_integer_spec.rb b/library/stringscanner/scan_integer_spec.rb
index a0b3685bae..fe0d26f404 100644
--- a/library/stringscanner/scan_integer_spec.rb
+++ b/library/stringscanner/scan_integer_spec.rb
@@ -25,7 +25,7 @@
     end
 
     # https://github.com/ruby/strscan/issues/130
-    ruby_bug "", "3.4"..."3.5" do # introduced in strscan v3.1.1
+    ruby_bug "", "3.4"..."4.0" do # introduced in strscan v3.1.1
       it "sets the last match result" do
         s = StringScanner.new("42abc")
         s.scan_integer
@@ -68,7 +68,6 @@
         }.should raise_error(ArgumentError, "Unsupported integer base: 5, expected 10 or 16")
       end
 
-      ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
       version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
         it "does not match '0x' prefix on its own" do
           StringScanner.new("0x").scan_integer(base: 16).should == nil
@@ -76,7 +75,6 @@
           StringScanner.new("+0x").scan_integer(base: 16).should == nil
         end
       end
-      end
 
       version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
         it "matches '0' in a '0x' that is followed by non-hex characters" do
@@ -96,7 +94,6 @@
 
   describe "#[] successive call with a capture group name" do
     # https://github.com/ruby/strscan/issues/139
-    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
     version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
       it "returns nil substring when matching succeeded" do
         s = StringScanner.new("42")
@@ -105,7 +102,6 @@
         s[:a].should == nil
       end
     end
-    end
     version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
       it "raises IndexError when matching succeeded" do
         s = StringScanner.new("42")
@@ -131,7 +127,6 @@
     end
 
     # https://github.com/ruby/strscan/issues/135
-    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
     version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
       it "does not ignore the previous matching with Regexp" do
         s = StringScanner.new("42")
@@ -145,7 +140,6 @@
         s[:a].should == "42"
       end
     end
-    end
     version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
       it "ignores the previous matching with Regexp" do
         s = StringScanner.new("42")
diff --git a/library/stringscanner/scan_until_spec.rb b/library/stringscanner/scan_until_spec.rb
index 737d83a14c..610060d6f1 100644
--- a/library/stringscanner/scan_until_spec.rb
+++ b/library/stringscanner/scan_until_spec.rb
@@ -41,7 +41,6 @@
     end
 
     # https://github.com/ruby/strscan/issues/131
-    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
     version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.1"
       it "sets the last match result if given a String" do
         @s.scan_until("a")
@@ -51,7 +50,6 @@
         @s.post_match.should == " test"
       end
     end
-    end
 
     version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
       it "sets the last match result if given a String" do
@@ -82,7 +80,6 @@
     version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
       context "when #scan_until was called with a String pattern" do
         # https://github.com/ruby/strscan/issues/139
-        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
         version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
           it "returns nil when matching succeeded" do
             @s.scan_until("This")
@@ -90,7 +87,6 @@
             @s[:a].should be_nil
           end
         end
-        end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
           it "raises IndexError when matching succeeded" do
             @s.scan_until("This")
@@ -111,7 +107,6 @@
         end
 
         # https://github.com/ruby/strscan/issues/135
-        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
         version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
           it "ignores the previous matching with Regexp" do
             @s.exist?(/(?<a>This)/)
@@ -123,7 +118,6 @@
             @s[:a].should be_nil
           end
         end
-        end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
           it "ignores the previous matching with Regexp" do
             @s.exist?(/(?<a>This)/)
diff --git a/library/stringscanner/search_full_spec.rb b/library/stringscanner/search_full_spec.rb
index a089da2043..197adfda4d 100644
--- a/library/stringscanner/search_full_spec.rb
+++ b/library/stringscanner/search_full_spec.rb
@@ -50,7 +50,6 @@
     end
 
     # https://github.com/ruby/strscan/issues/131
-    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
     version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.1"
       it "sets the last match result if given a String" do
         @s.search_full("is a", false, false)
@@ -60,7 +59,6 @@
         @s.post_match.should == " test"
       end
     end
-    end
 
     version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
       it "sets the last match result if given a String" do
@@ -91,7 +89,6 @@
     version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
       context "when #search_full was called with a String pattern" do
         # https://github.com/ruby/strscan/issues/139
-        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
         version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
           it "returns nil when matching succeeded" do
             @s.search_full("This", false, false)
@@ -99,7 +96,6 @@
             @s[:a].should be_nil
           end
         end
-        end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
           it "raises IndexError when matching succeeded" do
             @s.search_full("This", false, false)
diff --git a/library/stringscanner/skip_until_spec.rb b/library/stringscanner/skip_until_spec.rb
index f5be4b5ceb..5d73d8f0b9 100644
--- a/library/stringscanner/skip_until_spec.rb
+++ b/library/stringscanner/skip_until_spec.rb
@@ -38,7 +38,6 @@
     end
 
     # https://github.com/ruby/strscan/issues/131
-    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
     version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.1"
       it "sets the last match result if given a String" do
         @s.skip_until("a")
@@ -48,7 +47,6 @@
         @s.post_match.should == " test"
       end
     end
-    end
 
     version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
       it "sets the last match result if given a String" do
@@ -79,7 +77,6 @@
     version_is StringScanner::Version, "3.1.1" do # ruby_version_is "3.4"
       context "when #skip_until was called with a String pattern" do
         # https://github.com/ruby/strscan/issues/139
-        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
         version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
           it "returns nil when matching succeeded" do
             @s.skip_until("This")
@@ -87,7 +84,6 @@
             @s[:a].should be_nil
           end
         end
-        end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
           it "raises IndexError when matching succeeded" do
             @s.skip_until("This")
@@ -108,7 +104,6 @@
         end
 
         # https://github.com/ruby/strscan/issues/135
-        ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
         version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
           it "ignores the previous matching with Regexp" do
             @s.exist?(/(?<a>This)/)
@@ -120,7 +115,6 @@
             @s[:a].should be_nil
           end
         end
-        end
         version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4"
           it "ignores the previous matching with Regexp" do
             @s.exist?(/(?<a>This)/)
diff --git a/optional/capi/ext/rubyspec.h b/optional/capi/ext/rubyspec.h
index 8aaec36f46..6c4bea5da0 100644
--- a/optional/capi/ext/rubyspec.h
+++ b/optional/capi/ext/rubyspec.h
@@ -35,8 +35,8 @@
    (RUBY_API_VERSION_MAJOR == (major) && RUBY_API_VERSION_MINOR < (minor)))
 #define RUBY_VERSION_SINCE(major,minor) (!RUBY_VERSION_BEFORE(major, minor))
 
-#if RUBY_VERSION_SINCE(3, 5)
-#define RUBY_VERSION_IS_3_5
+#if RUBY_VERSION_SINCE(4, 0)
+#define RUBY_VERSION_IS_4_0
 #endif
 
 #if RUBY_VERSION_SINCE(3, 4)
diff --git a/optional/capi/ext/set_spec.c b/optional/capi/ext/set_spec.c
index 7af922fd49..11a271b361 100644
--- a/optional/capi/ext/set_spec.c
+++ b/optional/capi/ext/set_spec.c
@@ -1,7 +1,7 @@
 #include "ruby.h"
 #include "rubyspec.h"
 
-#ifdef RUBY_VERSION_IS_3_5
+#ifdef RUBY_VERSION_IS_4_0
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/optional/capi/ext/thread_spec.c b/optional/capi/ext/thread_spec.c
index 6ee111b7b7..ac77e4e813 100644
--- a/optional/capi/ext/thread_spec.c
+++ b/optional/capi/ext/thread_spec.c
@@ -166,7 +166,7 @@ static VALUE thread_spec_ruby_native_thread_p_new_thread(VALUE self) {
 #endif
 }
 
-#ifdef RUBY_VERSION_IS_3_5
+#ifdef RUBY_VERSION_IS_4_0
 static VALUE thread_spec_ruby_thread_has_gvl_p(VALUE self) {
   return ruby_thread_has_gvl_p() ? Qtrue : Qfalse;
 }
@@ -185,7 +185,7 @@ void Init_thread_spec(void) {
   rb_define_method(cls,  "rb_thread_create", thread_spec_rb_thread_create, 2);
   rb_define_method(cls,  "ruby_native_thread_p", thread_spec_ruby_native_thread_p, 0);
   rb_define_method(cls,  "ruby_native_thread_p_new_thread", thread_spec_ruby_native_thread_p_new_thread, 0);
-#ifdef RUBY_VERSION_IS_3_5
+#ifdef RUBY_VERSION_IS_4_0
   rb_define_method(cls,  "ruby_thread_has_gvl_p", thread_spec_ruby_thread_has_gvl_p, 0);
 #endif
 }
diff --git a/optional/capi/set_spec.rb b/optional/capi/set_spec.rb
index 3b7ee812c5..3e35be0505 100644
--- a/optional/capi/set_spec.rb
+++ b/optional/capi/set_spec.rb
@@ -1,6 +1,6 @@
 require_relative 'spec_helper'
 
-ruby_version_is "3.5" do
+ruby_version_is "4.0" do
   load_extension("set")
 
   describe "C-API Set function" do
diff --git a/optional/capi/string_spec.rb b/optional/capi/string_spec.rb
index 605c43769d..72f20ee6a5 100644
--- a/optional/capi/string_spec.rb
+++ b/optional/capi/string_spec.rb
@@ -193,7 +193,7 @@ def inspect
     it "returns a new String object filled with \\0 bytes" do
       lens = [4]
 
-      ruby_version_is "3.5" do
+      ruby_version_is "4.0" do
         lens << 100
       end
 
@@ -1230,7 +1230,7 @@ def inspect
       -> { str.upcase! }.should raise_error(RuntimeError, 'can\'t modify string; temporarily locked')
     end
 
-    ruby_version_is "3.5" do
+    ruby_version_is "4.0" do
       it "raises FrozenError if string is frozen" do
         str = -"rb_str_locktmp"
         -> { @s.rb_str_locktmp(str) }.should raise_error(FrozenError)
@@ -1254,7 +1254,7 @@ def inspect
       -> { @s.rb_str_unlocktmp(+"test") }.should raise_error(RuntimeError, 'temporal unlocking already unlocked string')
     end
 
-    ruby_version_is "3.5" do
+    ruby_version_is "4.0" do
       it "raises FrozenError if string is frozen" do
         str = -"rb_str_locktmp"
         -> { @s.rb_str_unlocktmp(str) }.should raise_error(FrozenError)
diff --git a/optional/capi/thread_spec.rb b/optional/capi/thread_spec.rb
index cd9ae8ff19..117726f0e2 100644
--- a/optional/capi/thread_spec.rb
+++ b/optional/capi/thread_spec.rb
@@ -185,7 +185,7 @@ def call_capi_rb_thread_wakeup
     end
   end
 
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     describe "ruby_thread_has_gvl_p" do
       it "returns true if the current thread has the GVL" do
         @t.ruby_thread_has_gvl_p.should be_true
diff --git a/security/cve_2020_10663_spec.rb b/security/cve_2020_10663_spec.rb
index 80e860348b..c44a13a0dd 100644
--- a/security/cve_2020_10663_spec.rb
+++ b/security/cve_2020_10663_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../spec_helper'
 
-ruby_version_is ""..."3.5" do
+ruby_version_is ""..."4.0" do
   require 'json'
 
   module JSONSpecs
diff --git a/shared/kernel/raise.rb b/shared/kernel/raise.rb
index 8432c83594..2be06ea797 100644
--- a/shared/kernel/raise.rb
+++ b/shared/kernel/raise.rb
@@ -141,7 +141,7 @@ def e.exception
     end
   end
 
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     it "allows cause keyword argument" do
       cause = StandardError.new("original error")
       result = nil
@@ -272,7 +272,7 @@ def e.exception
 end
 
 describe :kernel_raise_across_contexts, shared: true do
-  ruby_version_is "3.5" do
+  ruby_version_is "4.0" do
     describe "with cause keyword argument" do
       it "uses the cause from the calling context" do
         original_cause = nil