Merge branch 'main' into VickyStash/bugfix/improve-onboardingInitialPath-check

Author: VickyStash

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009018403
-        versionName "9.1.84-3"
+        versionCode 1009018502
+        versionName "9.1.85-2"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

android/app/build.gradle

@@ -8,6 +8,7 @@
         "ADDCOMMENT",
         "Addendums",
         "ADFS",
+        "Aeroplan",
         "águero",
         "Aircall",
         "airshipconfig",
@@ -37,6 +38,7 @@
         "ARROWLEFT",
         "ARROWRIGHT",
         "ARROWUP",
+        "ARNK",
         "artículo",
         "artículos",
         "as_siteseach",
@@ -110,6 +112,7 @@
         "cmjs",
         "cocoapods",
         "Codat",
+        "codeshare",
         "codegen",
         "Codice",
         "Combustors",
@@ -171,6 +174,7 @@
         "endfor",
         "entityid",
         "Entra",
+        "enroute",
         "ENVFILE",
         "Ephermeral",
         "ERECEIPT",
@@ -529,7 +533,9 @@
         "Saqbd",
         "SBFJ",
         "Scaleway",
-        "Scaleway’s",
+        "Scaleway's",
+        "schedulable",
+        "Schengen",
         "Schiffli",
         "SCIM",
         "scriptname",
@@ -598,6 +604,7 @@
         "togglefullscreen",
         "TOTP",
         "touchables",
+        "Touchless",
         "TQBQW",
         "Trainline",
         "tranid",
@@ -647,6 +654,7 @@
         "vvcf",
         "vypj",
         "waitlist",
+        "waitlisted",
         "Warchoł",
         "WDYR",
         "webapps",

cspell.json

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.84</string>
+	<string>9.1.85</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.1.84.3</string>
+	<string>9.1.85.2</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.84</string>
+	<string>9.1.85</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.84.3</string>
+	<string>9.1.85.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.84</string>
+	<string>9.1.85</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.84.3</string>
+	<string>9.1.85.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/ShareViewController/Info.plist

@@ -1,5 +1,5 @@
-ContactsModule_kotlinVersion=1.9.24
-ContactsModule_minSdkVersion=23
-ContactsModule_targetSdkVersion=34
-ContactsModule_compileSdkVersion=34
-ContactsModule_ndkVersion=26.1.10909125
+ContactsModule_kotlinVersion=2.0.21
+ContactsModule_minSdkVersion=24
+ContactsModule_targetSdkVersion=35
+ContactsModule_compileSdkVersion=35
+ContactsModule_ndkVersion=27.1.12297006

modules/ExpensifyNitroUtils/android/gradle.properties

@@ -1,5 +1,5 @@
 ReactNativeBackgroundTask_kotlinVersion=2.0.21
 ReactNativeBackgroundTask_minSdkVersion=24
-ReactNativeBackgroundTask_targetSdkVersion=34
+ReactNativeBackgroundTask_targetSdkVersion=35
 ReactNativeBackgroundTask_compileSdkVersion=35
 ReactNativeBackgroundTask_ndkversion=27.1.12297006

modules/background-task/android/gradle.properties

@@ -1,5 +1,5 @@
 ReactNativeHybridApp_kotlinVersion=2.0.21
 ReactNativeHybridApp_minSdkVersion=24
-ReactNativeHybridApp_targetSdkVersion=34
+ReactNativeHybridApp_targetSdkVersion=35
 ReactNativeHybridApp_compileSdkVersion=35
 ReactNativeHybridApp_ndkVersion=27.1.12297006