From b0a1a9b4dce7508374d14008f3ca156bdfec4ec9 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 22 Jun 2023 14:59:00 -0400
Subject: [PATCH 1/2] Merge pull request #21340 from
Expensify/version-BUILD-DF144D58-CF8E-4AB8-8AE2-D135CA238A6C
Update version to 1.3.31-2 on main
(cherry picked from commit 561297e950d94c3a9e85d1dfb1ff0edfc586ac0e)
---
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 57f791db16b1..15f74e15fb81 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 1001033101
- versionName "1.3.31-1"
+ versionCode 1001033102
+ versionName "1.3.31-2"
}
splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index f459bd3d7469..1ef3cc14622a 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -32,7 +32,7 @@
CFBundleVersion
- 1.3.31.1
+ 1.3.31.2
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index dc0a8d72f297..29c5d14096ac 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.3.31.1
+ 1.3.31.2
diff --git a/package-lock.json b/package-lock.json
index 479eb62933b2..c7d8191d4871 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.3.31-1",
+ "version": "1.3.31-2",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.3.31-1",
+ "version": "1.3.31-2",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index dbca9fdc8550..9febabda4acd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.3.31-1",
+ "version": "1.3.31-2",
"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 e1b2de121372da1e04b05a7f7e53ebdf704e1873 Mon Sep 17 00:00:00 2001
From: Carlos Martins
Date: Thu, 22 Jun 2023 12:48:50 -0600
Subject: [PATCH 2/2] Merge pull request #21335 from
Expensify/cmartins-updateReactNativeImageSize
[No QA] Update react-native-image-size
(cherry picked from commit 10270ba2f20e3c5775f42142d1c2e67dbae3ca60)
---
package-lock.json | 12 ++++++------
package.json | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index c7d8191d4871..b8f968268073 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -73,7 +73,7 @@
"react-native-haptic-feedback": "^1.13.0",
"react-native-image-pan-zoom": "^2.1.12",
"react-native-image-picker": "^5.1.0",
- "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#6b5ab5110dc3ed554f8eafbc38d7d87c17147972",
+ "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#8393b7e58df6ff65fd41f60aee8ece8822c91e2b",
"react-native-key-command": "^1.0.1",
"react-native-localize": "^2.2.6",
"react-native-modal": "^13.0.0",
@@ -36642,8 +36642,8 @@
},
"node_modules/react-native-image-size": {
"version": "1.1.3",
- "resolved": "git+ssh://git@github.com/Expensify/react-native-image-size.git#6b5ab5110dc3ed554f8eafbc38d7d87c17147972",
- "integrity": "sha512-jNNpW5byieb7pb/l0HRvmCav4BtzpTzgC+ybT+Wbi2yyroOukveVvnjwWnmoOeuGynsYB4Yt5eGrWZnPnJSwqQ==",
+ "resolved": "git+ssh://git@github.com/Expensify/react-native-image-size.git#8393b7e58df6ff65fd41f60aee8ece8822c91e2b",
+ "integrity": "sha512-y1OQ0D4WbQQzg+ulZPph41Z/YKYn+QTyzBIZMj9KFqHBDpzSAzfs3/DhYau48QSWUtgeYjHim9R+rvOIWPBVmw==",
"license": "MIT"
},
"node_modules/react-native-key-command": {
@@ -68355,9 +68355,9 @@
"requires": {}
},
"react-native-image-size": {
- "version": "git+ssh://git@github.com/Expensify/react-native-image-size.git#6b5ab5110dc3ed554f8eafbc38d7d87c17147972",
- "integrity": "sha512-jNNpW5byieb7pb/l0HRvmCav4BtzpTzgC+ybT+Wbi2yyroOukveVvnjwWnmoOeuGynsYB4Yt5eGrWZnPnJSwqQ==",
- "from": "react-native-image-size@git+https://github.com/Expensify/react-native-image-size#6b5ab5110dc3ed554f8eafbc38d7d87c17147972"
+ "version": "git+ssh://git@github.com/Expensify/react-native-image-size.git#8393b7e58df6ff65fd41f60aee8ece8822c91e2b",
+ "integrity": "sha512-y1OQ0D4WbQQzg+ulZPph41Z/YKYn+QTyzBIZMj9KFqHBDpzSAzfs3/DhYau48QSWUtgeYjHim9R+rvOIWPBVmw==",
+ "from": "react-native-image-size@git+https://github.com/Expensify/react-native-image-size#8393b7e58df6ff65fd41f60aee8ece8822c91e2b"
},
"react-native-key-command": {
"version": "1.0.1",
diff --git a/package.json b/package.json
index 9febabda4acd..b1eb06a262f7 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
"react-native-haptic-feedback": "^1.13.0",
"react-native-image-pan-zoom": "^2.1.12",
"react-native-image-picker": "^5.1.0",
- "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#6b5ab5110dc3ed554f8eafbc38d7d87c17147972",
+ "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#8393b7e58df6ff65fd41f60aee8ece8822c91e2b",
"react-native-key-command": "^1.0.1",
"react-native-localize": "^2.2.6",
"react-native-modal": "^13.0.0",