Skip to content

Commit 445f06e

Browse files
Merge branch 'main' of github.com:callstack-internal/Expensify-App into fix-72137
2 parents 3d4501b + 8edb23d commit 445f06e

62 files changed

Lines changed: 1644 additions & 456 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Gemfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ ruby ">= 3.3.4"
66
gem "cocoapods", "= 1.15.2"
77
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
88
gem 'xcodeproj', '< 1.26.0'
9-
gem "fastlane", "~> 2", ">= 2.227.1"
9+
gem "fastlane", "~> 2", ">= 2.228.0"
1010
gem "xcpretty", "~> 0"
11+
gem "openssl", ">= 3.3.1"
1112

1213

1314
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')

Gemfile.lock

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ GEM
121121
faraday_middleware (1.2.1)
122122
faraday (~> 1.0)
123123
fastimage (2.4.0)
124-
fastlane (2.227.1)
124+
fastlane (2.228.0)
125125
CFPropertyList (>= 2.3, < 4.0.0)
126126
addressable (>= 2.8, < 3.0.0)
127127
artifactory (~> 3.0)
@@ -242,14 +242,15 @@ GEM
242242
mutex_m (0.2.0)
243243
nanaimo (0.3.0)
244244
nap (1.1.0)
245-
naturally (2.2.1)
245+
naturally (2.3.0)
246246
netrc (0.11.0)
247247
nkf (0.2.0)
248+
openssl (3.3.1)
248249
optparse (0.6.0)
249250
os (1.1.4)
250251
plist (3.7.2)
251252
public_suffix (4.0.7)
252-
rake (13.2.1)
253+
rake (13.3.0)
253254
representable (3.2.0)
254255
declarative (< 0.1.0)
255256
trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -309,11 +310,12 @@ DEPENDENCIES
309310
benchmark
310311
bigdecimal
311312
cocoapods (= 1.15.2)
312-
fastlane (~> 2, >= 2.227.1)
313+
fastlane (~> 2, >= 2.228.0)
313314
fastlane-plugin-aws_s3
314315
fastlane-plugin-firebase_app_distribution
315316
logger
316317
mutex_m
318+
openssl (>= 3.3.1)
317319
xcodeproj (< 1.26.0)
318320
xcpretty (~> 0)
319321

Mobile-Expensify

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ android {
114114
minSdkVersion rootProject.ext.minSdkVersion
115115
targetSdkVersion rootProject.ext.targetSdkVersion
116116
multiDexEnabled rootProject.ext.multiDexEnabled
117-
versionCode 1009023402
118-
versionName "9.2.34-2"
117+
versionCode 1009023500
118+
versionName "9.2.35-0"
119119
// Supported language variants must be declared here to avoid from being removed during the compilation.
120120
// This also helps us to not include unnecessary language variants in the APK.
121121
resConfigs "en", "es"

cspell.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,8 @@
818818
"src/CONST/index.ts",
819819
"src/libs/SearchParser/*",
820820
"modules/group-ib-fp",
821-
"web/snippets/gib.js"
821+
"web/snippets/gib.js",
822+
"tests/unit/hooks/useLetterAvatars.test.tsx"
822823
],
823824
"ignoreRegExpList": ["@assets/.*"],
824825
"useGitignore": true

ios/NewExpensify/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<key>CFBundlePackageType</key>
2424
<string>APPL</string>
2525
<key>CFBundleShortVersionString</key>
26-
<string>9.2.34</string>
26+
<string>9.2.35</string>
2727
<key>CFBundleSignature</key>
2828
<string>????</string>
2929
<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.2.34.2</string>
47+
<string>9.2.35.0</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<key>CFBundleName</key>
1212
<string>$(PRODUCT_NAME)</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>9.2.34</string>
14+
<string>9.2.35</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.2.34.2</string>
16+
<string>9.2.35.0</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

ios/ShareViewController/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<key>CFBundleName</key>
1212
<string>$(PRODUCT_NAME)</string>
1313
<key>CFBundleShortVersionString</key>
14-
<string>9.2.34</string>
14+
<string>9.2.35</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.2.34.2</string>
16+
<string>9.2.35.0</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionAttributes</key>

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.2.34-2",
3+
"version": "9.2.35-0",
44
"author": "Expensify, Inc.",
55
"homepage": "https://new.expensify.com",
66
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

0 commit comments

Comments
 (0)