depend on Zeitwerk 2

3 files changed, 11 insertions, 4 deletions

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index db9c7e96f3..cf72673dbb 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,9 @@
+*   Depends on Zeitwerk 2, which stores less metadata if reloading is disabled
+    and hence uses less memory when `config.cache_classes` is `true`, a standard
+    setup in production.
+
+    *Xavier Noria*
+
 *   In `:zeitwerk` mode, eager load directories in engines and applications only
     if present in their respective `config.eager_load_paths`.
 
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec
index bf0fe0f76d..e719fc6176 100644
--- a/activesupport/activesupport.gemspec
+++ b/activesupport/activesupport.gemspec
@@ -34,5 +34,5 @@ Gem::Specification.new do |s|
   s.add_dependency "tzinfo",          "~> 1.1"
   s.add_dependency "minitest",        "~> 5.1"
   s.add_dependency "concurrent-ruby", "~> 1.0", ">= 1.0.2"
-  s.add_dependency "zeitwerk",        "~> 1.4", ">= 1.4.3"
+  s.add_dependency "zeitwerk",        "~> 2.0"
 end
diff --git a/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb b/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb
index a43d03cf09..faf9edef27 100644
--- a/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb
+++ b/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb
@@ -51,15 +51,15 @@ module ActiveSupport
       end
 
       class << self
-        def take_over
-          setup_autoloaders
+        def take_over(enable_reloading:)
+          setup_autoloaders(enable_reloading)
           freeze_paths
           decorate_dependencies
         end
 
         private
 
-          def setup_autoloaders
+          def setup_autoloaders(enable_reloading)
             Dependencies.autoload_paths.each do |autoload_path|
               # Zeitwerk only accepts existing directories in `push_dir` to
               # prevent misconfigurations.
@@ -72,6 +72,7 @@ module ActiveSupport
               autoloader.do_not_eager_load(autoload_path) unless eager_load?(autoload_path)
             end
 
+            Rails.autoloaders.main.enable_reloading if enable_reloading
             Rails.autoloaders.each(&:setup)
           end