Skip to content

Commit 882cc11

Browse files
stelselimYogendraShelke
stelselim
authored and
YogendraShelke
committed
add required changes for Xcode 26
1 parent 68da24c commit 882cc11

3 files changed

Lines changed: 54 additions & 73 deletions

File tree

‎ios/Podfile‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,17 @@ target 'DeveloperApp' do
7373
)
7474

7575
installer.pods_project.targets.each do |target|
76+
77+
if target.name == 'fmt'
78+
target.build_configurations.each do |config|
79+
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)']
80+
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] << 'FMT_USE_CONSTEXPR=0'
81+
config.build_settings['OTHER_CPLUSPLUSFLAGS'] ||= ['$(inherited)']
82+
config.build_settings['OTHER_CPLUSPLUSFLAGS'] << '-Wno-invalid-constexpr'
83+
config.build_settings['CLANG_CXX_LANGUAGE_STANDARD'] = 'c++23'
84+
end
85+
end
86+
7687
target.build_configurations.each do |config|
7788

7889
if target.name.start_with?('React') || target.name == 'RCTTypeSafety'

‎ios/developerapp.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,6 @@
173173
isa = PBXFileSystemSynchronizedRootGroup;
174174
exceptions = (
175175
);
176-
explicitFileTypes = {
177-
};
178-
explicitFolders = (
179-
);
180176
path = Extension;
181177
sourceTree = "<group>";
182178
};
@@ -517,7 +513,6 @@
517513
};
518514
};
519515
buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "developerapp" */;
520-
compatibilityVersion = "Xcode 3.2";
521516
developmentRegion = en;
522517
hasScannedForEncodings = 0;
523518
knownRegions = (
@@ -528,6 +523,7 @@
528523
packageReferences = (
529524
10BF55CA2C231533000F10AD /* XCRemoteSwiftPackageReference "CodeScanner" */,
530525
);
526+
preferredProjectObjectVersion = 77;
531527
productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
532528
projectDirPath = "";
533529
projectRoot = "";
@@ -608,15 +604,12 @@
608604
buildActionMask = 2147483647;
609605
files = (
610606
);
611-
inputPaths = (
612-
"${PODS_ROOT}/Target Support Files/Pods-DeveloperApp/Pods-DeveloperApp-frameworks.sh",
613-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
614-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermesvm.framework/hermesvm",
607+
inputFileListPaths = (
608+
"${PODS_ROOT}/Target Support Files/Pods-DeveloperApp/Pods-DeveloperApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
615609
);
616610
name = "[CP] Embed Pods Frameworks";
617-
outputPaths = (
618-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
619-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermesvm.framework",
611+
outputFileListPaths = (
612+
"${PODS_ROOT}/Target Support Files/Pods-DeveloperApp/Pods-DeveloperApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
620613
);
621614
runOnlyForDeploymentPostprocessing = 0;
622615
shellPath = /bin/sh;
@@ -642,69 +635,12 @@
642635
buildActionMask = 2147483647;
643636
files = (
644637
);
645-
inputPaths = (
646-
"${PODS_ROOT}/Target Support Files/Pods-DeveloperApp/Pods-DeveloperApp-resources.sh",
647-
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore/FirebaseCore_Privacy.bundle",
648-
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension/FirebaseCoreExtension_Privacy.bundle",
649-
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal/FirebaseCoreInternal_Privacy.bundle",
650-
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCrashlytics/FirebaseCrashlytics_Privacy.bundle",
651-
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations/FirebaseInstallations_Privacy.bundle",
652-
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseMessaging/FirebaseMessaging_Privacy.bundle",
653-
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
654-
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleMaps/GoogleMapsResources.bundle",
655-
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities_Privacy.bundle",
656-
"${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager/IQKeyboardManager.bundle",
657-
"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle",
658-
"${PODS_CONFIGURATION_BUILD_DIR}/PromisesSwift/Promises_Privacy.bundle",
659-
"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly/RCT-Folly_privacy.bundle",
660-
"${PODS_CONFIGURATION_BUILD_DIR}/RNCAsyncStorage/RNCAsyncStorage_resources.bundle",
661-
"${PODS_CONFIGURATION_BUILD_DIR}/RNDeviceInfo/RNDeviceInfoPrivacyInfo.bundle",
662-
"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
663-
"${PODS_CONFIGURATION_BUILD_DIR}/RNSVG/RNSVGFilters.bundle",
664-
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
665-
"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
666-
"${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive/SSZipArchive.bundle",
667-
"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
668-
"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
669-
"${PODS_CONFIGURATION_BUILD_DIR}/nanopb/nanopb_Privacy.bundle",
670-
"${PODS_CONFIGURATION_BUILD_DIR}/react-native-blob-util/ReactNativeBlobUtilPrivacyInfo.bundle",
671-
"${PODS_CONFIGURATION_BUILD_DIR}/react-native-cameraroll/RNCameraRollPrivacyInfo.bundle",
672-
"${PODS_CONFIGURATION_BUILD_DIR}/react-native-google-maps/GoogleMapsPrivacy.bundle",
673-
"${PODS_CONFIGURATION_BUILD_DIR}/react-native-image-picker/RNImagePickerPrivacyInfo.bundle",
674-
"${PODS_CONFIGURATION_BUILD_DIR}/react-native-maps/ReactNativeMapsPrivacy.bundle",
675-
"${PODS_ROOT}/../../node_modules/@react-native-vector-icons/material-icons/fonts/MaterialIcons.ttf",
638+
inputFileListPaths = (
639+
"${PODS_ROOT}/Target Support Files/Pods-DeveloperApp/Pods-DeveloperApp-resources-${CONFIGURATION}-input-files.xcfilelist",
676640
);
677641
name = "[CP] Copy Pods Resources";
678-
outputPaths = (
679-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCore_Privacy.bundle",
680-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreExtension_Privacy.bundle",
681-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreInternal_Privacy.bundle",
682-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCrashlytics_Privacy.bundle",
683-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseInstallations_Privacy.bundle",
684-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseMessaging_Privacy.bundle",
685-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
686-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMapsResources.bundle",
687-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleUtilities_Privacy.bundle",
688-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/IQKeyboardManager.bundle",
689-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle",
690-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Promises_Privacy.bundle",
691-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle",
692-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNCAsyncStorage_resources.bundle",
693-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNDeviceInfoPrivacyInfo.bundle",
694-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
695-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNSVGFilters.bundle",
696-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
697-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
698-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SSZipArchive.bundle",
699-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",
700-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",
701-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/nanopb_Privacy.bundle",
702-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ReactNativeBlobUtilPrivacyInfo.bundle",
703-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNCameraRollPrivacyInfo.bundle",
704-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMapsPrivacy.bundle",
705-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImagePickerPrivacyInfo.bundle",
706-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ReactNativeMapsPrivacy.bundle",
707-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf",
642+
outputFileListPaths = (
643+
"${PODS_ROOT}/Target Support Files/Pods-DeveloperApp/Pods-DeveloperApp-resources-${CONFIGURATION}-output-files.xcfilelist",
708644
);
709645
runOnlyForDeploymentPostprocessing = 0;
710646
shellPath = /bin/sh;

‎patches/react-native+0.83.4.patch‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,37 @@ index 95dbf82..b1b5f9f 100644
109109
[self
110110
addRequestHandler:^(NSDictionary<NSString *, id> *request, RCTPackagerClientResponder *responder) {
111111
[handler handleRequest:request withResponder:responder];
112+
diff --git a/node_modules/react-native/third-party-podspecs/RCT-Folly.podspec b/node_modules/react-native/third-party-podspecs/RCT-Folly.podspec
113+
index 8852179..040c4f0 100644
114+
--- a/node_modules/react-native/third-party-podspecs/RCT-Folly.podspec
115+
+++ b/node_modules/react-native/third-party-podspecs/RCT-Folly.podspec
116+
@@ -25,7 +25,7 @@ Pod::Spec.new do |spec|
117+
spec.dependency "DoubleConversion"
118+
spec.dependency "glog"
119+
spec.dependency "fast_float", "8.0.0"
120+
- spec.dependency "fmt", "11.0.2"
121+
+ spec.dependency "fmt", "12.1.0"
122+
spec.compiler_flags = '-Wno-documentation -faligned-new'
123+
spec.source_files = 'folly/String.cpp',
124+
'folly/Conv.cpp',
125+
diff --git a/node_modules/react-native/third-party-podspecs/fmt.podspec b/node_modules/react-native/third-party-podspecs/fmt.podspec
126+
index 2f38990..a40c575 100644
127+
--- a/node_modules/react-native/third-party-podspecs/fmt.podspec
128+
+++ b/node_modules/react-native/third-party-podspecs/fmt.podspec
129+
@@ -8,14 +8,14 @@ fmt_git_url = fmt_config[:git]
130+
131+
Pod::Spec.new do |spec|
132+
spec.name = "fmt"
133+
- spec.version = "11.0.2"
134+
+ spec.version = "12.1.0"
135+
spec.license = { :type => "MIT" }
136+
spec.homepage = "https://github.com/fmtlib/fmt"
137+
spec.summary = "{fmt} is an open-source formatting library for C++. It can be used as a safe and fast alternative to (s)printf and iostreams."
138+
spec.authors = "The fmt contributors"
139+
spec.source = {
140+
:git => fmt_git_url,
141+
- :tag => "11.0.2"
142+
+ :tag => "12.1.0"
143+
}
144+
spec.pod_target_xcconfig = {
145+
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),

0 commit comments

Comments
 (0)