From c4c4f5401ca81c5d500d22610e4f169d26b49cae Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <4123478+tido64@users.noreply.github.com>
Date: Mon, 9 Oct 2023 11:02:00 +0200
Subject: [PATCH] fix(apple): disable `deterministic_uuids` starting with 0.73
---
ios/ReactTestApp/Info.plist | 10 ++--------
ios/test_app.rb | 5 ++++-
macos/ReactTestApp/Info.plist | 10 ++--------
3 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/ios/ReactTestApp/Info.plist b/ios/ReactTestApp/Info.plist
index c9db63f02..4fedce72e 100644
--- a/ios/ReactTestApp/Info.plist
+++ b/ios/ReactTestApp/Info.plist
@@ -43,14 +43,8 @@
NSAppTransportSecurity
- NSExceptionDomains
-
- localhost
-
- NSExceptionAllowsInsecureHTTPLoads
-
-
-
+ NSAllowsLocalNetworking
+
NSCameraUsageDescription
The camera is needed to scan QR codes for JS bundle URLs
diff --git a/ios/test_app.rb b/ios/test_app.rb
index 1548699d9..12ca47944 100644
--- a/ios/test_app.rb
+++ b/ios/test_app.rb
@@ -393,6 +393,7 @@ def make_project!(xcodeproj, project_root, target_platform, options)
:ios => config.resolve_build_setting('IPHONEOS_DEPLOYMENT_TARGET'),
:macos => config.resolve_build_setting('MACOSX_DEPLOYMENT_TARGET'),
},
+ :react_native_version => rn_version,
:use_fabric => use_fabric,
:use_turbomodule => use_turbomodule,
:code_sign_identity => code_sign_identity || '',
@@ -408,7 +409,9 @@ def use_test_app_internal!(target_platform, options)
project_target = make_project!(xcodeproj, project_root, target_platform, options)
xcodeproj_dst, platforms = project_target.values_at(:xcodeproj_path, :platforms)
- install! 'cocoapods', :deterministic_uuids => false if project_target[:use_turbomodule]
+ if project_target[:use_turbomodule] || project_target[:react_native_version] >= 7300
+ install! 'cocoapods', :deterministic_uuids => false
+ end
require_relative(autolink_script_path(project_root, target_platform))
diff --git a/macos/ReactTestApp/Info.plist b/macos/ReactTestApp/Info.plist
index 812287729..54609f963 100644
--- a/macos/ReactTestApp/Info.plist
+++ b/macos/ReactTestApp/Info.plist
@@ -26,14 +26,8 @@
$(MACOSX_DEPLOYMENT_TARGET)
NSAppTransportSecurity
- NSExceptionDomains
-
- localhost
-
- NSExceptionAllowsInsecureHTTPLoads
-
-
-
+ NSAllowsLocalNetworking
+
NSHumanReadableCopyright
Copyright © 2020 Microsoft. All rights reserved.