Merge pull request CocoaPods#971 from CocoaPods/1-25-stable

Merge 1-25 stable
belka-car · Oct 3, 2024 · a01324e · a01324e
2 parents f44d3bb + 5f7d32f
commit a01324e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,19 @@
 * None.  
 
 
+## 1.25.1 (2024-10-03)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Bump `rexml` dependency to address [CVE-2024-43398](https://www.ruby-lang.org/en/news/2024/08/22/dos-rexml-cve-2024-43398/).  
+  [Eric Amorde](https://github.com/amorde)
+  [#970](https://github.com/CocoaPods/Xcodeproj/pull/970)
+
+
 ## 1.25.0 (2024-08-07)
 
 ##### Enhancements

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -14,13 +14,13 @@ GIT
 PATH
   remote: .
   specs:
-    xcodeproj (1.25.0)
+    xcodeproj (1.25.1)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (>= 3.3.2, < 4.0)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
 
 GEM
   remote: https://rubygems.org/
@@ -77,7 +77,7 @@ GEM
       mocha (>= 0.13.0)
     multi_json (1.12.1)
     multipart-post (2.1.1)
-    nanaimo (0.3.0)
+    nanaimo (0.4.0)
     nap (1.1.0)
     nkf (0.2.0)
     notify (0.5.2)
@@ -98,8 +98,7 @@ GEM
       ffi (>= 0.5.0)
     rb-kqueue (0.2.4)
       ffi (>= 0.5.0)
-    rexml (3.3.4)
-      strscan
+    rexml (3.3.8)
     rubocop (0.47.1)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
@@ -115,7 +114,6 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.9.0)
     simplecov-html (0.9.0)
-    strscan (3.1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     unicode-display_width (1.4.0)

diff --git a/lib/xcodeproj/gem_version.rb b/lib/xcodeproj/gem_version.rb
@@ -1,5 +1,5 @@
 module Xcodeproj
   # The version of the xcodeproj gem.
   #
-  VERSION = '1.25.0'.freeze unless defined? Xcodeproj::VERSION
+  VERSION = '1.25.1'.freeze unless defined? Xcodeproj::VERSION
 end
diff --git a/xcodeproj.gemspec b/xcodeproj.gemspec
@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'CFPropertyList', '>= 2.3.3', '< 4.0'
   s.add_runtime_dependency 'claide',         '>= 1.0.2', '< 2.0'
   s.add_runtime_dependency 'colored2',       '~> 3.1'
-  s.add_runtime_dependency 'nanaimo',        '~> 0.3.0'
-  s.add_runtime_dependency 'rexml',          '>= 3.3.2', '< 4.0'
+  s.add_runtime_dependency 'nanaimo',        '~> 0.4.0'
+  s.add_runtime_dependency 'rexml',          '>= 3.3.6', '< 4.0'
 
   ## Make sure you can build the gem on older versions of RubyGems too:
   s.rubygems_version = '1.6.2'