From 9b2f6147b6a14ccc0550e2e01a29ff363e4eb43a Mon Sep 17 00:00:00 2001 From: Siddarth Kumar Date: Mon, 22 Apr 2024 18:01:45 +0200 Subject: [PATCH] upgrade react-native-permissions library to 4.1.5 (#19695) ## Summary This commit upgrades `react-native-permissions` library to latest version 4.1.5 needed for : https://github.com/status-im/status-mobile/issues/18138 ## Review & Test notes Please test permissions related flows on onboarding, selecting images, notifications and any other areas you can think of. ## Platforms - iOS - Android status: ready --- ios/Podfile | 30 ++++++++++++++++++-------- ios/Podfile.lock | 18 +++------------- ios/StatusIm.xcodeproj/project.pbxproj | 6 ++++++ package.json | 2 +- yarn.lock | 18 ++++------------ 5 files changed, 35 insertions(+), 39 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 67ed816eaa..267059b6c4 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,13 +1,28 @@ -# Resolve react_native_pods.rb with node to allow for hoisting -require Pod::Executable.execute_command('node', ['-p', - 'require.resolve( - "react-native/scripts/react_native_pods.rb", - {paths: [process.argv[1]]}, - )', __dir__]).strip +def node_require(script) + # Resolve script with node to allow for hoisting + require Pod::Executable.execute_command('node', ['-p', + "require.resolve( + '#{script}', + {paths: [process.argv[1]]}, + )", __dir__]).strip +end + +node_require('react-native/scripts/react_native_pods.rb') +node_require('react-native-permissions/scripts/setup.rb') platform :ios, min_ios_version_supported prepare_react_native_project! +setup_permissions([ + 'Camera', + 'FaceID', + 'MediaLibrary', + 'Microphone', + 'Notifications', + 'PhotoLibrary', + 'PhotoLibraryAddOnly', +]) + linkage = ENV['USE_FRAMEWORKS'] if linkage != nil Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green @@ -43,9 +58,6 @@ abstract_target 'Status' do pod 'SSZipArchive', '2.4.3' - permissions_path = '../node_modules/react-native-permissions/ios' - pod 'Permission-Microphone', :path => "#{permissions_path}/Microphone/Permission-Microphone.podspec" - pod 'Permission-Camera', :path => "#{permissions_path}/Camera/Permission-Camera.podspec" pod "react-native-status-keycard", path: "../node_modules/react-native-status-keycard" pod "react-native-status", path: "../modules/react-native-status" pod "Keycard", git: "https://github.com/status-im/Keycard.swift.git" diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 2f382511ba..44ddf5572b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -28,10 +28,6 @@ PODS: - libwebp/mux (1.2.4): - libwebp/demux - libwebp/webp (1.2.4) - - Permission-Camera (3.8.0): - - RNPermissions - - Permission-Microphone (3.8.0): - - RNPermissions - RCT-Folly (2022.05.16.00): - boost - DoubleConversion @@ -1125,7 +1121,7 @@ PODS: - TOCropViewController - RNKeychain (8.1.2): - React-Core - - RNPermissions (3.8.0): + - RNPermissions (4.1.5): - React-Core - RNReanimated (3.6.1): - glog @@ -1158,8 +1154,6 @@ DEPENDENCIES: - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - Keycard (from `https://github.com/status-im/Keycard.swift.git`) - - Permission-Camera (from `../node_modules/react-native-permissions/ios/Camera/Permission-Camera.podspec`) - - Permission-Microphone (from `../node_modules/react-native-permissions/ios/Microphone/Permission-Microphone.podspec`) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) @@ -1269,10 +1263,6 @@ EXTERNAL SOURCES: :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" Keycard: :git: https://github.com/status-im/Keycard.swift.git - Permission-Camera: - :path: "../node_modules/react-native-permissions/ios/Camera/Permission-Camera.podspec" - Permission-Microphone: - :path: "../node_modules/react-native-permissions/ios/Microphone/Permission-Microphone.podspec" RCT-Folly: :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -1452,8 +1442,6 @@ SPEC CHECKSUMS: HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352 Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8 libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef - Permission-Camera: e6d142d7d8b714afe0a83e5e6ae17eb949f1e3e9 - Permission-Microphone: 644b1de8bcc2afcaf934e09a22bee507a95796a7 RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0 RCTRequired: 2544c0f1081a5fa12e108bb8cb40e5f4581ccd87 RCTTypeSafety: 50efabe2b115c11ed03fbf3fd79e2f163ddb5d7c @@ -1525,7 +1513,7 @@ SPEC CHECKSUMS: RNGestureHandler: 15c6ef51acba34c49ff03003806cf5dd6098f383 RNImageCropPicker: 486e2f7e2b0461ce24321f751410dce1b3b49e6d RNKeychain: a65256b6ca6ba6976132cc4124b238a5b13b3d9c - RNPermissions: 215c54462104b3925b412b0fb3c9c497b21c358b + RNPermissions: 08e619529cced22695f4b6d0efcc0a233e278903 RNReanimated: dee37576492f1a375017515f5c77e66e5eec696b RNShare: 859ff710211285676b0bcedd156c12437ea1d564 RNStaticSafeAreaInsets: 055ddbf5e476321720457cdaeec0ff2ba40ec1b8 @@ -1538,6 +1526,6 @@ SPEC CHECKSUMS: TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863 Yoga: a716eea57d0d3430219c0a5a233e1e93ee931eb7 -PODFILE CHECKSUM: c9c6dfac28e31314e1a2ee2dc47364ad151f13f2 +PODFILE CHECKSUM: bb02c595a4aa4430da978b55da5440811cbd9d91 COCOAPODS: 1.13.0 diff --git a/ios/StatusIm.xcodeproj/project.pbxproj b/ios/StatusIm.xcodeproj/project.pbxproj index 6a2ba759bb..ccb6727f43 100644 --- a/ios/StatusIm.xcodeproj/project.pbxproj +++ b/ios/StatusIm.xcodeproj/project.pbxproj @@ -602,12 +602,14 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh", "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( "${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", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle", ); @@ -624,12 +626,14 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh", "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( "${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", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle", ); @@ -668,12 +672,14 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh", "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( "${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", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle", ); diff --git a/package.json b/package.json index c23b103b43..8831d0d1cf 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "react-native-mail": "6.1.1", "react-native-navigation": "7.38.3", "react-native-orientation-locker": "^1.5.0", - "react-native-permissions": "3.8.0", + "react-native-permissions": "4.1.5", "react-native-reanimated": "3.6.1", "react-native-redash": "18.1.0", "react-native-shadow-2": "^7.0.8", diff --git a/yarn.lock b/yarn.lock index 0851ad1502..c87b3e2886 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7534,13 +7534,6 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -pkg-dir@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760" - integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA== - dependencies: - find-up "^5.0.0" - pngjs@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f" @@ -7956,13 +7949,10 @@ react-native-orientation-locker@^1.5.0: resolved "https://registry.yarnpkg.com/react-native-orientation-locker/-/react-native-orientation-locker-1.5.0.tgz#324853937eed4835ecd1c8613ab2206135d908ac" integrity sha512-4XOCGmNN4BXg5JUFjUuXpsfhPJmbA3LkQilJO1ed+6vL97teTdG2w5IEevKiqL9/hPjeWE8YYtX/YW+yp53hkg== -react-native-permissions@3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/react-native-permissions/-/react-native-permissions-3.8.0.tgz#7c1f75ae126c7d0b863eec9d2f5cd93ff8ad8310" - integrity sha512-BfZ7ksgdpGchHZH8M/kxCGZbWeACANbnPmb3hNjVOMDQusc4PWlPpobX3eBqYMSKbpi7bMECeV9BVU4QuwAf9A== - dependencies: - picocolors "^1.0.0" - pkg-dir "^5.0.0" +react-native-permissions@4.1.5: + version "4.1.5" + resolved "https://registry.yarnpkg.com/react-native-permissions/-/react-native-permissions-4.1.5.tgz#db4d1ddbf076570043f4fd4168f54bb6020aec92" + integrity sha512-r6VMRacASmtRHS+GZ+5HQCp9p9kiE+UU9magHOZCXZLTJitdTuVHWZRrb4v4oqZGU+zAp3mZhTQftuMMv+WLUg== react-native-randombytes@^3.5.1: version "3.6.1"