From 4b05abfbe5efac7e51c8e5247d427dedfe803158 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 24 May 2023 22:19:18 -0400
Subject: [PATCH 1/2] Merge pull request #19576 from
Expensify/version-BUILD-8B10901A-04F8-4CA3-B04F-BB9B84CC8CB3
Update version to 1.3.18-1 on main
(cherry picked from commit 7a42755a79737314edf702ce17bf0647dd8c41fb)
---
android/app/build.gradle | 4 ++--
ios/NewExpensify/Info.plist | 2 +-
ios/NewExpensifyTests/Info.plist | 2 +-
package-lock.json | 4 ++--
package.json | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 30f75388b8ca..9d93834e8599 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001031800
- versionName "1.3.18-0"
+ versionCode 1001031801
+ versionName "1.3.18-1"
}
splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 181a323698e8..d01e2afec47f 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.3.18.0
+ 1.3.18.1
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 5313aeb38f8d..c6c5f83ce413 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.3.18.0
+ 1.3.18.1
diff --git a/package-lock.json b/package-lock.json
index 7b64d1b97947..c8a556f10f7d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.3.18-0",
+ "version": "1.3.18-1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.3.18-0",
+ "version": "1.3.18-1",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 44d2fe9be1c1..f271249eb1c7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.3.18-0",
+ "version": "1.3.18-1",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
From 6ba0ce28f132b8946ec95b977798541c28bf17e1 Mon Sep 17 00:00:00 2001
From: Chirag Chandrakant Salian
Date: Wed, 24 May 2023 19:11:07 -0700
Subject: [PATCH 2/2] Merge pull request #19574 from
Expensify/revert-19485-Rory-FixPodCache
Revert "[No QA] Fix pod cache logic"
(cherry picked from commit 3e3c2dd57aea721ddd8b04bc504165ec602eb8c0)
---
.github/workflows/platformDeploy.yml | 4 ++--
.github/workflows/testBuild.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index 5fb2443698d8..92a0d361981f 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -158,13 +158,13 @@ jobs:
bundler-cache: true
- uses: actions/cache@v3
- id: cache-pods
with:
path: ios/Pods
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+ restore-keys: |
+ ${{ runner.os }}-pods-
- name: Install cocoapods
- if: ${{ !fromJSON(steps.cache-pods.outputs.cache-hit) }}
uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
with:
timeout_minutes: 10
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index e31b294821b3..428986d271a7 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -141,13 +141,13 @@ jobs:
bundler-cache: true
- uses: actions/cache@v3
- id: cache-pods
with:
path: ios/Pods
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+ restore-keys: |
+ ${{ runner.os }}-pods-
- name: Install cocoapods
- if: ${{ !fromJSON(steps.cache-pods.outputs.cache-hit) }}
uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
with:
timeout_minutes: 10