Merge 1-14 stable

CHANGELOG.md

@@ -11,6 +11,18 @@
 * None.  
 
 
+## 1.14.1 (2023-10-26)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Fix a crash when running with specific versions of activesupport  
+  [Eric Amorde](https://github.com/amorde)
+  [CocoaPods#12116](https://github.com/CocoaPods/CocoaPods/issues/12116)
+
 ## 1.14.0 (2023-10-26)
 
 ##### Enhancements

Gemfile

@@ -2,9 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-# We still support Ruby 2.6 in CI for Core. ActiveSupport > 7 is Ruby 2.7.x.
-gem 'activesupport', '>= 5.0', '< 7'
-
 group :development do
   gem 'bacon'
   gem 'mocha', '< 1.5'

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-core (1.14.0)
+    cocoapods-core (1.14.1)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -15,12 +15,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.6)
+    activesupport (7.1.1)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
@@ -30,10 +34,14 @@ GEM
     awesome_print (1.9.2)
     bacon (1.2.0)
     base64 (0.1.1)
+    bigdecimal (3.1.4)
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     crack (0.4.5)
       rexml
+    drb (2.1.1)
+      ruby2_keywords
     ethon (0.16.0)
       ffi (>= 1.15.0)
     ffi (1.16.3)
@@ -58,6 +66,7 @@ GEM
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.3)
       mocha (>= 0.13.0)
+    mutex_m (0.1.2)
     nap (1.1.0)
     netrc (0.11.0)
     notify (0.5.2)
@@ -99,6 +108,7 @@ GEM
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
@@ -110,13 +120,11 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.7.0)
-    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 5.0, < 7)
   awesome_print
   bacon
   cocoapods-core!

lib/cocoapods-core.rb

@@ -14,6 +14,9 @@ class Informative < PlainInformative; end
   require 'pathname'
   require 'cocoapods-core/vendor'
 
+  require 'active_support'
+  require 'active_support/core_ext'
+
   autoload :Version,        'cocoapods-core/version'
   autoload :Requirement,    'cocoapods-core/requirement'
   autoload :Dependency,     'cocoapods-core/dependency'

lib/cocoapods-core/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods-core.
   #
-  CORE_VERSION = '1.14.0'.freeze unless defined? Pod::CORE_VERSION
+  CORE_VERSION = '1.14.1'.freeze unless defined? Pod::CORE_VERSION
 end