Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fix pod install on linux #10452

Merged
merged 2 commits into from
Jul 31, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions patches/react-native+0.72.15.patch
Original file line number Diff line number Diff line change
Expand Up @@ -241,3 +241,43 @@ index 0000000..e69de29
diff --git a/node_modules/react-native/ReactCommon/react/renderer/components/rncore/States.h b/node_modules/react-native/ReactCommon/react/renderer/components/rncore/States.h
new file mode 100644
index 0000000..e69de29
diff --git a/node_modules/react-native/scripts/cocoapods/utils.rb b/node_modules/react-native/scripts/cocoapods/utils.rb
index 6507f8b..9e0ec97 100644
--- a/node_modules/react-native/scripts/cocoapods/utils.rb
+++ b/node_modules/react-native/scripts/cocoapods/utils.rb
@@ -354,20 +354,22 @@ class ReactNativePodsUtils
end

def self.is_using_xcode15_0(xcodebuild_manager: Xcodebuild)
- xcodebuild_version = xcodebuild_manager.version
-
- # The output of xcodebuild -version is something like
- # Xcode 15.0
- # or
- # Xcode 14.3.1
- # We want to capture the version digits
- regex = /(\d+)\.(\d+)(?:\.(\d+))?/
- if match_data = xcodebuild_version.match(regex)
- major = match_data[1].to_i
- minor = match_data[2].to_i
- return major == 15 && minor == 0
+ begin
leotm marked this conversation as resolved.
Show resolved Hide resolved
+ xcodebuild_version = xcodebuild_manager.version
+
+ # The output of xcodebuild -version is something like
+ # Xcode 15.0
+ # or
+ # Xcode 14.3.1
+ # We want to capture the version digits
+ regex = /(\d+)\.(\d+)(?:\.(\d+))?/
+ if match_data = xcodebuild_version.match(regex)
+ major = match_data[1].to_i
+ minor = match_data[2].to_i
+ return major == 15 && minor == 0
+ end
+ rescue => e
end
-
return false
end

Loading