From 64d2fc68fdf8722f84cf6077fd0ed45188b66df2 Mon Sep 17 00:00:00 2001 From: Utku <74243531+utkubakir@users.noreply.github.com> Date: Sat, 15 Apr 2023 11:56:08 +0300 Subject: [PATCH] Fix Mobile CI (#708) * fix pods * fix tests * clean --- apps/mobile/ios/Podfile | 16 ++++++++++-- apps/mobile/ios/Podfile.lock | 26 +++++++++---------- apps/mobile/ios/Podfile.properties.json | 3 ++- .../src/screens/onboarding/MasterPassword.tsx | 5 ++-- apps/mobile/tests/onboarding.yml | 7 ++--- 5 files changed, 36 insertions(+), 21 deletions(-) diff --git a/apps/mobile/ios/Podfile b/apps/mobile/ios/Podfile index 36cb46a2a..5460dfed4 100644 --- a/apps/mobile/ios/Podfile +++ b/apps/mobile/ios/Podfile @@ -7,7 +7,7 @@ podfile_properties = JSON.parse(File.read(File.join(__dir__, 'Podfile.properties ENV['RCT_NEW_ARCH_ENABLED'] = podfile_properties['newArchEnabled'] == 'true' ? '1' : '0' -platform :ios, podfile_properties['ios.deploymentTarget'] || '13.0' +platform :ios, podfile_properties['ios.deploymentTarget'] install! 'cocoapods', :deterministic_uuids => false @@ -67,6 +67,18 @@ target 'Spacedrive' do ) __apply_Xcode_12_5_M1_post_install_workaround(installer) + # Spacedrive - Sets the deployment target of Pods to "ios.deploymentTarget" + installer.generated_projects.each do |project| + project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = podfile_properties['ios.deploymentTarget'] + end + end + project.build_configurations.each do |bc| + bc.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = podfile_properties['ios.deploymentTarget'] + end + end + # This is necessary for Xcode 14, because it signs resource bundles by default # when building for devices. installer.target_installation_results.pod_target_installation_results @@ -75,7 +87,7 @@ target 'Spacedrive' do resource_bundle_target.build_configurations.each do |config| config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO' # Spacedrive - Added to fix the issue with the deployment target - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = podfile_properties['ios.deploymentTarget'] || '13.0' + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = podfile_properties['ios.deploymentTarget'] end end end diff --git a/apps/mobile/ios/Podfile.lock b/apps/mobile/ios/Podfile.lock index 019d64499..546ba6f9e 100644 --- a/apps/mobile/ios/Podfile.lock +++ b/apps/mobile/ios/Podfile.lock @@ -12,11 +12,11 @@ PODS: - EXMediaLibrary (15.2.3): - ExpoModulesCore - React-Core - - Expo (48.0.6): + - Expo (48.0.10): - ExpoModulesCore - ExpoKeepAwake (12.0.1): - ExpoModulesCore - - ExpoModulesCore (1.2.4): + - ExpoModulesCore (1.2.6): - React-Core - React-RCTAppDelegate - ReactCommon/turbomodule/core @@ -292,9 +292,9 @@ PODS: - React-jsinspector (0.71.3) - React-logger (0.71.3): - glog - - react-native-document-picker (8.1.3): + - react-native-document-picker (8.2.0): - React-Core - - react-native-safe-area-context (4.5.0): + - react-native-safe-area-context (4.5.1): - RCT-Folly - RCTRequired - RCTTypeSafety @@ -384,11 +384,11 @@ PODS: - React-jsi (= 0.71.3) - React-logger (= 0.71.3) - React-perflogger (= 0.71.3) - - RNCAsyncStorage (1.17.11): + - RNCAsyncStorage (1.17.12): - React-Core - RNCMaskedView (0.2.8): - React-Core - - RNFlashList (1.4.0): + - RNFlashList (1.4.2): - React-Core - RNFS (2.20.0): - React-Core @@ -610,9 +610,9 @@ SPEC CHECKSUMS: EXFileSystem: 844e86ca9b5375486ecc4ef06d3838d5597d895d EXFont: 6ea3800df746be7233208d80fe379b8ed74f4272 EXMediaLibrary: 587cd8aad27a6fc8d7c38b950bc75bc1845a7480 - Expo: 04ba1ddde0be07aff4306ae636a1804810679145 + Expo: b04d142a2b477a391b47c62d179c1a9e1140e6ad ExpoKeepAwake: 69f5f627670d62318410392d03e0b5db0f85759a - ExpoModulesCore: 1667335d4f4c9b7801990930e6f0eea42c916a21 + ExpoModulesCore: 6e0259511f4c4341b6b8357db393624df2280828 EXSplashScreen: cd7fb052dff5ba8311d5c2455ecbebffe1b7a8ca FBLazyVector: 60195509584153283780abdac5569feffb8f08cc FBReactNativeSpec: c5a5c4f1b95ae42a17cd22c8c89c482a7b327fe3 @@ -636,8 +636,8 @@ SPEC CHECKSUMS: React-jsiexecutor: 515b703d23ffadeac7687bc2d12fb08b90f0aaa1 React-jsinspector: 9f7c9137605e72ca0343db4cea88006cb94856dd React-logger: 957e5dc96d9dbffc6e0f15e0ee4d2b42829ff207 - react-native-document-picker: 958e2bc82e128be69055be261aeac8d872c8d34c - react-native-safe-area-context: 39c2d8be3328df5d437ac1700f4f3a4f75716acc + react-native-document-picker: 495c444c0c773c6e83a5d91165890ecb1c0a399a + react-native-safe-area-context: f5549f36508b1b7497434baa0cd97d7e470920d4 React-perflogger: af8a3d31546077f42d729b949925cc4549f14def React-RCTActionSheet: 57cc5adfefbaaf0aae2cf7e10bccd746f2903673 React-RCTAnimation: 11c61e94da700c4dc915cf134513764d87fc5e2b @@ -651,9 +651,9 @@ SPEC CHECKSUMS: React-RCTVibration: 5199a180d04873366a83855de55ac33ce60fe4d5 React-runtimeexecutor: 7bf0dafc7b727d93c8cb94eb00a9d3753c446c3e ReactCommon: 6f65ea5b7d84deb9e386f670dd11ce499ded7b40 - RNCAsyncStorage: 8616bd5a58af409453ea4e1b246521bb76578d60 + RNCAsyncStorage: 09fc8595e6d6f6d5abf16b23a56b257d9c6b7c5b RNCMaskedView: bc0170f389056201c82a55e242e5d90070e18e5a - RNFlashList: 399bf6a0db68f594ad2c86aaff3ea39564f39f8a + RNFlashList: 7fbca4fc075484a9426f1610d648dbea2de94eb0 RNFS: 4ac0f0ea233904cb798630b3c077808c06931688 RNGestureHandler: 071d7a9ad81e8b83fe7663b303d132406a7d8f39 RNReanimated: addc4900bf47882118d0a1b21747fa6705fa8cff @@ -661,6 +661,6 @@ SPEC CHECKSUMS: RNSVG: 07dbd870b0dcdecc99b3a202fa37c8ca163caec2 Yoga: 5ed1699acbba8863755998a4245daa200ff3817b -PODFILE CHECKSUM: a82d2337be62e4c4d092a59fb73875196b22ca98 +PODFILE CHECKSUM: 468d85abbbcf7578a977d626c82704a1c385c25a COCOAPODS: 1.11.3 diff --git a/apps/mobile/ios/Podfile.properties.json b/apps/mobile/ios/Podfile.properties.json index 35120e838..c5882a82e 100644 --- a/apps/mobile/ios/Podfile.properties.json +++ b/apps/mobile/ios/Podfile.properties.json @@ -1,3 +1,4 @@ { - "expo.jsEngine": "hermes" + "expo.jsEngine": "hermes", + "ios.deploymentTarget": "13.0" } diff --git a/apps/mobile/src/screens/onboarding/MasterPassword.tsx b/apps/mobile/src/screens/onboarding/MasterPassword.tsx index 60c28c526..76bca5dff 100644 --- a/apps/mobile/src/screens/onboarding/MasterPassword.tsx +++ b/apps/mobile/src/screens/onboarding/MasterPassword.tsx @@ -80,7 +80,7 @@ const MasterPasswordScreen = ({ navigation }: OnboardingStackScreenProps<'Master name="password" render={({ field: { onBlur, onChange, value } }) => ( ( {!showPasswordValidate ? 'Set password' : 'Confirm Password'} diff --git a/apps/mobile/tests/onboarding.yml b/apps/mobile/tests/onboarding.yml index a4f59c069..7939f4a37 100644 --- a/apps/mobile/tests/onboarding.yml +++ b/apps/mobile/tests/onboarding.yml @@ -8,13 +8,14 @@ appId: com.spacedrive.app - inputText: 'TestLib' - tapOn: 'New Library' - tapOn: - id: 'master-password' + id: 'password-input' - inputText: '12345678' - tapOn: 'Set Password' - tapOn: - id: 'master-password-confirm' + id: 'password-input-confirm' - inputText: '12345678' -- tapOn: 'Confirm Password' +- tapOn: + id: 'confirm-password-button' - tapOn: 'Continue' # Library creation can take a while... - extendedWaitUntil: