mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
[Local] Fix CI for 0.72, with Acitve Support and Xcode15 (#40855)
This commit is contained in:
@@ -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/
|
||||
|
||||
@@ -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'
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -140,7 +140,7 @@ class ReactNativePodsUtils
|
||||
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 @@ class ReactNativePodsUtils
|
||||
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(" ")
|
||||
|
||||
+567
-465
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user