Skip to content

Commit 6e3a130

Browse files
authored
[Local] Fix CI for 0.72, with Acitve Support and Xcode15 (#40855)
1 parent 9b3bd63 commit 6e3a130

File tree

5 files changed

+573
-469
lines changed

5 files changed

+573
-469
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ package-lock.json
107107
/packages/react-native/template/vendor
108108
.ruby-version
109109
/**/.ruby-version
110+
./vendor/
111+
vendor/
110112

111113
# iOS / CocoaPods
112114
/packages/react-native/template/ios/build/

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ source 'https://rubygems.org'
44
ruby ">= 2.6.10"
55

66
gem 'cocoapods', '~> 1.12'
7-
gem 'activesupport', '>= 6.1.7.1', '< 7.1.0'
7+
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ PLATFORMS
8989
ruby
9090

9191
DEPENDENCIES
92-
activesupport (>= 6.1.7.1)
92+
activesupport (>= 6.1.7.3, < 7.1.0)
9393
cocoapods (~> 1.12)
9494

9595
RUBY VERSION

packages/react-native/scripts/cocoapods/utils.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def self.apply_xcode_15_patch(installer, xcodebuild_manager: Xcodebuild)
140140
if self.is_using_xcode15_or_greter(:xcodebuild_manager => xcodebuild_manager)
141141
self.add_value_to_setting_if_missing(config, other_ld_flags_key, xcode15_compatibility_flags)
142142
else
143-
self.remove_value_to_setting_if_present(config, other_ld_flags_key, xcode15_compatibility_flags)
143+
self.remove_value_from_setting_if_present(config, other_ld_flags_key, xcode15_compatibility_flags)
144144
end
145145
end
146146
project.save()
@@ -308,7 +308,7 @@ def self.add_value_to_setting_if_missing(config, setting_name, value)
308308
end
309309
end
310310

311-
def self.remove_value_to_setting_if_present(config, setting_name, value)
311+
def self.remove_value_from_setting_if_present(config, setting_name, value)
312312
old_config = config.build_settings[setting_name]
313313
if old_config.is_a?(Array)
314314
old_config = old_config.join(" ")

0 commit comments

Comments
 (0)