Skip to content

🍒 Cherry pick PR #4339 to staging 🍒 #4373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OSBotify merged 2 commits into from
Aug 2, 2021
Merged

🍒 Cherry pick PR #4339 to staging 🍒 #4373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
674dcfe
Merge pull request #4372 from Expensify/version-BUILD-89366788125f2dc…
OSBotify Aug 2, 2021
c0b3d7e
Merge pull request #4339 from Expensify/joe-update-xcode-version
AndrewGable Aug 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/createNewVersion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
createNewVersion:
if: github.actor == 'OSBotify'
runs-on: macos-latest
runs-on: macos-11

steps:
# Version: 2.3.4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ on:
branches-ignore: [staging, production]

env:
DEVELOPER_DIR: /Applications/Xcode_12.3.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_12.5.app/Contents/Developer

jobs:
test:
if: github.actor != 'OSBotify'
runs-on: macos-latest
runs-on: macos-11
steps:
- uses: actions/checkout@v2
- uses: actions/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/finishReleaseCycle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

# Deploy deferred PRs to staging and create a new StagingDeployCash for the next release cycle.
createNewStagingDeployCash:
runs-on: macos-latest
runs-on: macos-11
needs: checkDeployBlockers
if: ${{ needs.checkDeployBlockers.outputs.hasDeployBlockers == 'false' }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lockDeploys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
lockStagingDeploys:
if: ${{ github.event.label.name == '🔐 LockCashDeploys 🔐' && contains(github.event.issue.labels.*.name, 'StagingDeployCash') && github.actor != 'OSBotify' }}
runs-on: macos-latest
runs-on: macos-11
steps:
# Version: 2.3.4
- uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/platformDeploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

env:
SHOULD_DEPLOY_PRODUCTION: ${{ github.event_name == 'release' }}
DEVELOPER_DIR: /Applications/Xcode_12.3.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_12.5.app/Contents/Developer

jobs:
android:
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
desktop:
name: Build and deploy Desktop
if: github.actor == 'OSBotify'
runs-on: macos-latest
runs-on: macos-11
steps:
- uses: actions/checkout@v2

Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
iOS:
name: Build and deploy iOS
if: github.actor == 'OSBotify'
runs-on: macos-latest
runs-on: macos-11
steps:
- uses: actions/checkout@v2

Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001008201
versionName "1.0.82-1"
versionCode 1001008202
versionName "1.0.82-2"
}
splits {
abi {
Expand Down
2 changes: 1 addition & 1 deletion ios/ExpensifyCash/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.0.82.1</string>
<string>1.0.82.2</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/ExpensifyCashTests/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0.82.1</string>
<string>1.0.82.2</string>
</dict>
</plist>
6 changes: 3 additions & 3 deletions ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ PODS:
- UMCore
- UMConstantsInterface (6.1.0):
- UMCore
- UMCore (7.1.0)
- UMCore (7.1.1)
- UMFaceDetectorInterface (6.1.0)
- UMFileSystemInterface (6.1.0)
- UMFontInterface (6.1.0)
Expand Down Expand Up @@ -957,7 +957,7 @@ SPEC CHECKSUMS:
UMBarCodeScannerInterface: 96a01d81ff0c7febbfefc2d7396db9e7462d8c68
UMCameraInterface: 8ad433fdadca22703ebeb614d42b814092d38d69
UMConstantsInterface: 55c79ca258a3ede70480fed85e3843899cd47ea3
UMCore: 0da048c9753abcea0042258e6ad0fed77811f7e1
UMCore: 063edcab3a9de0c44301fe77af147aa1a654b40f
UMFaceDetectorInterface: 4db950a25e785796a237bcebb8fff05078c4fb61
UMFileSystemInterface: 4a92ee36e6c2757833031718f8496690fa931280
UMFontInterface: 81a951117d03f57aa636fba3992adefd0191f200
Expand All @@ -972,4 +972,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 2092930e33e7aa4d68cdf783d6174465bd3ce380

COCOAPODS: 1.10.1
COCOAPODS: 1.10.2
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
"version": "1.0.82-1",
"version": "1.0.82-2",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
Expand Down