From 61db6ed6ca2779ec86bc9458cb8ad070497853c7 Mon Sep 17 00:00:00 2001 From: Max Hoffmann <40920984+naxey@users.noreply.github.com> Date: Sat, 6 Apr 2024 18:13:00 +0200 Subject: [PATCH 1/2] delete deprecated Xcode version check --- .../react-native/third-party-podspecs/glog.podspec | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/packages/react-native/third-party-podspecs/glog.podspec b/packages/react-native/third-party-podspecs/glog.podspec index f921ec63cdb1..7d88ca087bb5 100644 --- a/packages/react-native/third-party-podspecs/glog.podspec +++ b/packages/react-native/third-party-podspecs/glog.podspec @@ -30,18 +30,6 @@ Pod::Spec.new do |spec| spec.exclude_files = "src/windows/**/*" spec.compiler_flags = '-Wno-shorten-64-to-32' - # TODO: T167482718 Remove this code after April 2024, when Apple will - # push the lower version of Xcode required to upload apps to the Store. - xcode_path = `xcodebuild -version` # This return the current version of Xcode - - match = xcode_path.match(/Xcode (\d+)\.(\d+)/) - major_version = match[1].to_i - minor_version = match[2].to_i - is_greater_than_15 = major_version >= 15 - is_greater_than_14_3 = major_version == 14 && minor_version >= 3 - should_define_modules = is_greater_than_15 ? "YES" : is_greater_than_14_3 ? "YES" : "NO" - # End TODO. - spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "HEADER_SEARCH_PATHS" => "$(PODS_TARGET_SRCROOT)/src", From 1eabbfa333ad43f5656792674c3f62ca057fbf1a Mon Sep 17 00:00:00 2001 From: Max Hoffmann <40920984+naxey@users.noreply.github.com> Date: Sun, 7 Apr 2024 13:16:38 +0000 Subject: [PATCH 2/2] remove should_define_modules reference --- packages/react-native/third-party-podspecs/glog.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-native/third-party-podspecs/glog.podspec b/packages/react-native/third-party-podspecs/glog.podspec index 7d88ca087bb5..6fbda3a94275 100644 --- a/packages/react-native/third-party-podspecs/glog.podspec +++ b/packages/react-native/third-party-podspecs/glog.podspec @@ -33,7 +33,7 @@ Pod::Spec.new do |spec| spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "HEADER_SEARCH_PATHS" => "$(PODS_TARGET_SRCROOT)/src", - "DEFINES_MODULE" => should_define_modules # When the workaround is removed, set this var to "YES" + "DEFINES_MODULE" => "YES" } # Pinning to the same version as React.podspec.