From 9e2b222520153b681d4e13f3fbd87e3a99893a30 Mon Sep 17 00:00:00 2001 From: frank Date: Mon, 30 Sep 2024 09:46:46 +0800 Subject: [PATCH] feat_: support xcode 16 --- ios/Podfile.lock | 59 +++++++++++++------------- ios/StatusIm.xcodeproj/project.pbxproj | 12 ++++++ nix/overlay.nix | 2 +- package.json | 2 +- yarn.lock | 8 ++-- 5 files changed, 48 insertions(+), 35 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 07f43fc43e..dab4cb278e 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,6 +1,7 @@ PODS: + - BigInt (5.2.0) - boost (1.83.0) - - CryptoSwift (1.5.1) + - CryptoSwift (1.8.3) - DoubleConversion (1.1.6) - FBLazyVector (0.73.5) - FBReactNativeSpec (0.73.5): @@ -16,20 +17,24 @@ PODS: - hermes-engine/Pre-built (= 0.73.5) - hermes-engine/Pre-built (0.73.5) - HMSegmentedControl (1.5.6) - - Keycard (3.0.6): + - Keycard (3.1.0): + - BigInt - CryptoSwift - secp256k1 - SSZipArchive - libevent (2.1.12) - - libwebp (1.2.4): - - libwebp/demux (= 1.2.4) - - libwebp/mux (= 1.2.4) - - libwebp/webp (= 1.2.4) - - libwebp/demux (1.2.4): + - libwebp (1.3.2): + - libwebp/demux (= 1.3.2) + - libwebp/mux (= 1.3.2) + - libwebp/sharpyuv (= 1.3.2) + - libwebp/webp (= 1.3.2) + - libwebp/demux (1.3.2): - libwebp/webp - - libwebp/mux (1.2.4): + - libwebp/mux (1.3.2): - libwebp/demux - - libwebp/webp (1.2.4) + - libwebp/sharpyuv (1.3.2) + - libwebp/webp (1.3.2): + - libwebp/sharpyuv - RCT-Folly (2022.05.16.00): - boost - DoubleConversion @@ -935,8 +940,6 @@ PODS: - React - react-native-orientation-locker (1.5.0): - React-Core - - react-native-pdf (6.7.5): - - React-Core - react-native-shake (3.4.0): - React - react-native-slider (3.0.0): @@ -1150,15 +1153,15 @@ PODS: - glog - RCT-Folly (= 2022.05.16.00) - React-Core - - RNImageCropPicker (0.40.0): + - RNImageCropPicker (0.41.2): - React-Core - React-RCTImage - - RNImageCropPicker/QBImagePickerController (= 0.40.0) - - TOCropViewController - - RNImageCropPicker/QBImagePickerController (0.40.0): + - RNImageCropPicker/QBImagePickerController (= 0.41.2) + - TOCropViewController (~> 2.7.4) + - RNImageCropPicker/QBImagePickerController (0.41.2): - React-Core - React-RCTImage - - TOCropViewController + - TOCropViewController (~> 2.7.4) - RNKeychain (8.1.2): - React-Core - RNLinearGradient (3.0.0-alpha.1): @@ -1187,7 +1190,7 @@ PODS: - secp256k1 (0.1.6) - SocketRocket (0.6.1) - SSZipArchive (2.4.3) - - TOCropViewController (2.6.1) + - TOCropViewController (2.7.4) - Yoga (1.14.0) DEPENDENCIES: @@ -1235,7 +1238,6 @@ DEPENDENCIES: - react-native-lottie-splash-screen (from `../node_modules/react-native-lottie-splash-screen`) - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)" - react-native-orientation-locker (from `../node_modules/react-native-orientation-locker`) - - react-native-pdf (from `../node_modules/react-native-pdf`) - react-native-shake (from `../node_modules/react-native-shake`) - "react-native-slider (from `../node_modules/@react-native-community/slider`)" - react-native-status (from `../modules/react-native-status`) @@ -1285,6 +1287,7 @@ DEPENDENCIES: SPEC REPOS: trunk: + - BigInt - CryptoSwift - fmt - HMSegmentedControl @@ -1380,8 +1383,6 @@ EXTERNAL SOURCES: :path: "../node_modules/@react-native-community/netinfo" react-native-orientation-locker: :path: "../node_modules/react-native-orientation-locker" - react-native-pdf: - :path: "../node_modules/react-native-pdf" react-native-shake: :path: "../node_modules/react-native-shake" react-native-slider: @@ -1476,26 +1477,27 @@ EXTERNAL SOURCES: CHECKOUT OPTIONS: Keycard: - :commit: 17381678bb981c3c553bb7202a26e642cecb1817 + :commit: afb19836d6730ade5035f6f86ad90715be336af2 :git: https://github.com/status-im/Keycard.swift.git secp256k1: - :commit: 46a1fa30d9b8babeae85ff519050f42394ab5fcc + :commit: 4ab977cc2b2d7319be858bcb30a5d189bb149884 :git: https://github.com/status-im/secp256k1.swift.git :submodules: true SPEC CHECKSUMS: + BigInt: f668a80089607f521586bbe29513d708491ef2f7 boost: d3f49c53809116a5d38da093a8aa78bf551aed09 - CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082 + CryptoSwift: 967f37cea5a3294d9cce358f78861652155be483 DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953 FBLazyVector: 56e0e498dbb513b96c40bac6284729ba4e62672d FBReactNativeSpec: 146c741a3f40361f6bc13a4ba284678cbedb5881 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: c0eca6ffed0a6fde1965ef26dcc7bf528f052af4 + glog: 53cc9a00a2af0495ac1613e9fe3df6e646a3f405 hermes-engine: 1d1835b2cc54c381909d94d1b3c8e0a2f1a94a0e HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352 - Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8 + Keycard: 3bd24405b9a875b3b3cf1ab1be69b5c30c5f28bc libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef + libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0 RCTRequired: 2544c0f1081a5fa12e108bb8cb40e5f4581ccd87 RCTTypeSafety: 50efabe2b115c11ed03fbf3fd79e2f163ddb5d7c @@ -1530,7 +1532,6 @@ SPEC CHECKSUMS: react-native-lottie-splash-screen: 4e1b1fd9d6633f9cd2106d6877eb5ba0147f3e2b react-native-netinfo: ddaca8bbb9e6e914b1a23787ccb879bc642931c9 react-native-orientation-locker: 851f6510d8046ea2f14aa169b1e01fcd309a94ba - react-native-pdf: 103940c90d62adfd259f63cca99c7c0c306b514c react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c react-native-slider: 12bd76d3d568c9c5500825db54123d44b48e4ad4 react-native-status: 21f75d492fd311dc111303da38a7a2b23a8a8466 @@ -1566,7 +1567,7 @@ SPEC CHECKSUMS: RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7 RNFS: 2bd9eb49dc82fa9676382f0585b992c424cd59df RNGestureHandler: 15c6ef51acba34c49ff03003806cf5dd6098f383 - RNImageCropPicker: 486e2f7e2b0461ce24321f751410dce1b3b49e6d + RNImageCropPicker: 771e2ca319d2cf92e04ebf334ece892ee9a6728f RNKeychain: a65256b6ca6ba6976132cc4124b238a5b13b3d9c RNLinearGradient: ccaaebce083b54180da61d992e7fa56abfe000d6 RNPermissions: 08e619529cced22695f4b6d0efcc0a233e278903 @@ -1579,7 +1580,7 @@ SPEC CHECKSUMS: secp256k1: f61d67e6fdcb85fd727acf1bf35ace6036db540c SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef - TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863 + TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654 Yoga: a716eea57d0d3430219c0a5a233e1e93ee931eb7 PODFILE CHECKSUM: 5dd4a5279260d370bcdf016158c825ceb404ee06 diff --git a/ios/StatusIm.xcodeproj/project.pbxproj b/ios/StatusIm.xcodeproj/project.pbxproj index 1885308bbf..ec6288292d 100644 --- a/ios/StatusIm.xcodeproj/project.pbxproj +++ b/ios/StatusIm.xcodeproj/project.pbxproj @@ -572,6 +572,8 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", @@ -579,6 +581,8 @@ ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CryptoSwift.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle", @@ -614,6 +618,8 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", @@ -621,6 +627,8 @@ ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CryptoSwift.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle", @@ -728,6 +736,8 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/RNImageCropPickerPrivacyInfo.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", @@ -735,6 +745,8 @@ ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CryptoSwift.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNImageCropPickerPrivacyInfo.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle", diff --git a/nix/overlay.nix b/nix/overlay.nix index 9e25f1ba20..7ca7aa675f 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -56,7 +56,7 @@ in { yarn = super.yarn.override { nodejs = super.nodejs_20; }; openjdk = super.openjdk17_headless; xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } { - versions = ["15.1" "15.2" "15.3" "15.4"]; + versions = ["15.1" "15.2" "15.3" "15.4" "16.0"]; }; go = super.go_1_21; clang = super.clang_15; diff --git a/package.json b/package.json index 5534913fb3..6a661299f2 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "react-native-get-random-values": "^1.11.0", "react-native-gifted-charts": "^1.3.2", "react-native-hole-view": "^3.0.0-alpha4", - "react-native-image-crop-picker": "0.40.0", + "react-native-image-crop-picker": "0.41.2", "react-native-image-resizer": "^1.2.3", "react-native-keychain": "8.1.2", "react-native-linear-gradient": "3.0.0-alpha.1", diff --git a/yarn.lock b/yarn.lock index 9d6fb23d55..c836af0da4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9469,10 +9469,10 @@ react-native-hole-view@^3.0.0-alpha4: resolved "https://registry.yarnpkg.com/react-native-hole-view/-/react-native-hole-view-3.0.0-alpha4.tgz#b5f54df380636c3b4dfacd5c297117f068fa4531" integrity sha512-pAIQCA13Dn42xLFsVziFXHRtTgRJ13SBrb1vwFG7cIFslMjmBhPdFlUrqYcN+wMTt2+OnZhRxgM4Yaf4+gARDg== -react-native-image-crop-picker@0.40.0: - version "0.40.0" - resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.40.0.tgz#cf378a4cbdb64b9b6ff94399b8515ff3bdccbf9c" - integrity sha512-FpqiCS4CiPQp8qIorlELWKbpi1d9lyhJki9spZr4LShv9hk65GWo6tYJupfTV19o5XcRwJn8d4MHIUoyWMJRTQ== +react-native-image-crop-picker@0.41.2: + version "0.41.2" + resolved "https://registry.npmjs.org/react-native-image-crop-picker/-/react-native-image-crop-picker-0.41.2.tgz#824fa8fee8391fbb3e0b5ae2973221a2dff0cafb" + integrity sha512-GcDu/adXU/1y/MrxsbOfqcGRGWC2pTttt5VGy/jyRJ6GXfoC29fTQf8SG5kGtc5schSR6K+mKYO4uW6eJPljlQ== react-native-image-resizer@^1.2.3: version "1.2.3"