Skip to content

Commit 7931f93

Browse files
committed
Merge branch 'main' into remove-onyx-connect-in-Task-p1
2 parents 12eb762 + b7b6678 commit 7931f93

51 files changed

Lines changed: 574 additions & 239 deletions

Some content is hidden

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

.github/workflows/remote-build-ios.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ concurrency:
1313
jobs:
1414
build:
1515
runs-on: ${{ github.repository_owner == 'Expensify' && 'macos-15-xlarge' || 'macos-15' }}
16+
env:
17+
DEVELOPER_DIR: /Applications/Xcode_16.4.0.app/Contents/Developer
1618
strategy:
1719
fail-fast: false
1820
matrix:

.github/workflows/testBuild.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ jobs:
369369
if: ${{ inputs.IOS }}
370370
needs: [prep, getMobileExpensifyPR, getMobileExpensifyRef]
371371
env:
372-
DEVELOPER_DIR: /Applications/Xcode_16.2.0.app/Contents/Developer
372+
DEVELOPER_DIR: /Applications/Xcode_16.4.0.app/Contents/Developer
373373
runs-on: macos-15-xlarge
374374
outputs:
375375
IOS_PATH: ${{ steps.export-ios-path.outputs.IOS_PATH }}
@@ -519,4 +519,4 @@ jobs:
519519
ANDROID: ${{ needs.androidHybrid.result }}
520520
IOS: ${{ needs.iosHybrid.result }}
521521
ANDROID_LINK: ${{ needs.androidHybrid.outputs.S3_APK_PATH }}
522-
IOS_LINK: ${{ needs.iosHybrid.outputs.IOS_PATH }}
522+
IOS_LINK: ${{ needs.iosHybrid.outputs.IOS_PATH }}

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 1009019600
118-
versionName "9.1.96-0"
117+
versionCode 1009019601
118+
versionName "9.1.96-1"
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"

help/GUIDELINES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# New Help Guidelines
2-
This file outlines a series of specific rules. Whenever editing any file on this site, please verify your changes comply with these rules.
2+
This file outlines a series of specific rules. Whenever editing any file on this site, _please_ verify your changes comply with these rules.
33

44
## General Philosophy
55
In general, this help site is built around a few common principles:

ios/NewExpensify/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</dict>
4545
</array>
4646
<key>CFBundleVersion</key>
47-
<string>9.1.96.0</string>
47+
<string>9.1.96.1</string>
4848
<key>FullStory</key>
4949
<dict>
5050
<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.1.96</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.96.0</string>
16+
<string>9.1.96.1</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

ios/ShareViewController/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.1.96</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.1.96.0</string>
16+
<string>9.1.96.1</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.1.96-0",
3+
"version": "9.1.96-1",
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)