From 674dcfeaf463b2ad56ef9c40dc4ec5906d8210f8 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Mon, 2 Aug 2021 11:22:47 -0700 Subject: [PATCH 1/2] Merge pull request #4372 from Expensify/version-BUILD-89366788125f2dc5958207241724b1e3acebd138 (cherry picked from commit dc79a3f8f67453b6258369d4b4797376c1175ce0) --- android/app/build.gradle | 4 ++-- ios/ExpensifyCash/Info.plist | 2 +- ios/ExpensifyCashTests/Info.plist | 2 +- package-lock.json | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 5feb320ca8587..3d9b9bebd5b96 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -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 { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 9d3a7ce1c54cf..c92231397a19b 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.82.1 + 1.0.82.2 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index 46252fa8293ae..777d404b19b97 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.82.1 + 1.0.82.2 diff --git a/package-lock.json b/package-lock.json index ff5d6cb2cf2cf..a83df0fbd213a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.82-1", + "version": "1.0.82-2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 7f6d52a4f8cc9..ac3a42e0cc74e 100644 --- a/package.json +++ b/package.json @@ -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.", From c0b3d7e639dc72e333da3dcba484688d81ea4cd2 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Mon, 2 Aug 2021 11:14:59 -0600 Subject: [PATCH 2/2] Merge pull request #4339 from Expensify/joe-update-xcode-version Update XCode to fix iOS deploy (cherry picked from commit 8db44bcae507b24a889170b7fef5e020d4f68255) --- .github/workflows/createNewVersion.yml | 2 +- .github/workflows/e2e.yml | 4 ++-- .github/workflows/finishReleaseCycle.yml | 2 +- .github/workflows/lockDeploys.yml | 2 +- .github/workflows/platformDeploy.yml | 6 +++--- ios/Podfile.lock | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml index 9fb1f7100aa5c..4252e6c6dcb42 100644 --- a/.github/workflows/createNewVersion.yml +++ b/.github/workflows/createNewVersion.yml @@ -10,7 +10,7 @@ on: jobs: createNewVersion: if: github.actor == 'OSBotify' - runs-on: macos-latest + runs-on: macos-11 steps: # Version: 2.3.4 diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index a1cce6113adbb..30ea5497df76e 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -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 diff --git a/.github/workflows/finishReleaseCycle.yml b/.github/workflows/finishReleaseCycle.yml index c6fdeabaf53eb..7d1aaace2ab42 100644 --- a/.github/workflows/finishReleaseCycle.yml +++ b/.github/workflows/finishReleaseCycle.yml @@ -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: diff --git a/.github/workflows/lockDeploys.yml b/.github/workflows/lockDeploys.yml index 49d58b33f7787..9123870b449eb 100644 --- a/.github/workflows/lockDeploys.yml +++ b/.github/workflows/lockDeploys.yml @@ -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 diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index 4d0760f2c5bd2..3c85ac4a1d019 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -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: @@ -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 @@ -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 diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 26a81647d8aff..266fa84eaa6ad 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -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) @@ -957,7 +957,7 @@ SPEC CHECKSUMS: UMBarCodeScannerInterface: 96a01d81ff0c7febbfefc2d7396db9e7462d8c68 UMCameraInterface: 8ad433fdadca22703ebeb614d42b814092d38d69 UMConstantsInterface: 55c79ca258a3ede70480fed85e3843899cd47ea3 - UMCore: 0da048c9753abcea0042258e6ad0fed77811f7e1 + UMCore: 063edcab3a9de0c44301fe77af147aa1a654b40f UMFaceDetectorInterface: 4db950a25e785796a237bcebb8fff05078c4fb61 UMFileSystemInterface: 4a92ee36e6c2757833031718f8496690fa931280 UMFontInterface: 81a951117d03f57aa636fba3992adefd0191f200 @@ -972,4 +972,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 2092930e33e7aa4d68cdf783d6174465bd3ce380 -COCOAPODS: 1.10.1 +COCOAPODS: 1.10.2