[Local] Fix CI for 0.72, with Acitve Support and Xcode15 (#40855)

facebook · Oct 12, 2023 · 6e3a130 · 6e3a130
1 parent 9b3bd63
commit 6e3a130
Show file tree

Hide file tree

Showing 5 changed files with 573 additions and 469 deletions.
diff --git a/.gitignore b/.gitignore
@@ -107,6 +107,8 @@ package-lock.json
 /packages/react-native/template/vendor
 .ruby-version
 /**/.ruby-version
+./vendor/
+vendor/
 
 # iOS / CocoaPods
 /packages/react-native/template/ios/build/

diff --git a/Gemfile b/Gemfile
@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 ruby ">= 2.6.10"
 
 gem 'cocoapods', '~> 1.12'
-gem 'activesupport', '>= 6.1.7.1', '< 7.1.0'
+gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -89,7 +89,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 6.1.7.1)
+  activesupport (>= 6.1.7.3, < 7.1.0)
   cocoapods (~> 1.12)
 
 RUBY VERSION

diff --git a/packages/react-native/scripts/cocoapods/utils.rb b/packages/react-native/scripts/cocoapods/utils.rb
@@ -140,7 +140,7 @@ def self.apply_xcode_15_patch(installer, xcodebuild_manager: Xcodebuild)
                 if self.is_using_xcode15_or_greter(:xcodebuild_manager => xcodebuild_manager)
                     self.add_value_to_setting_if_missing(config, other_ld_flags_key, xcode15_compatibility_flags)
                 else
-                    self.remove_value_to_setting_if_present(config, other_ld_flags_key, xcode15_compatibility_flags)
+                    self.remove_value_from_setting_if_present(config, other_ld_flags_key, xcode15_compatibility_flags)
                 end
             end
             project.save()
@@ -308,7 +308,7 @@ def self.add_value_to_setting_if_missing(config, setting_name, value)
         end
     end
 
-    def self.remove_value_to_setting_if_present(config, setting_name, value)
+    def self.remove_value_from_setting_if_present(config, setting_name, value)
         old_config = config.build_settings[setting_name]
         if old_config.is_a?(Array)
             old_config = old_config.join(" ")