From 725e4304672608b3818f717dd04786d1582c88d5 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 2 Sep 2022 04:13:00 -0400
Subject: [PATCH 1/2] Merge pull request #10777 from
Expensify/version-BUILD-26984692-26E8-4FA5-AE8D-09BB6337BC11
Update version to 1.1.96-2 on main
(cherry picked from commit 5be03908e7dca4f33c5d91ededa0e9812e706115)
---
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 9ca36b8a8376..f3779840ef0f 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -155,8 +155,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001019601
- versionName "1.1.96-1"
+ versionCode 1001019602
+ versionName "1.1.96-2"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 285a9ad1bead..a495f1f4d80d 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.1.96.1
+ 1.1.96.2
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 7f2d568fcdb7..def198abe030 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.96.1
+ 1.1.96.2
diff --git a/package-lock.json b/package-lock.json
index 19ff0b74e19e..178b54e984fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.1.96-1",
+ "version": "1.1.96-2",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.1.96-1",
+ "version": "1.1.96-2",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 5b2f13132b1f..d2ad8014f922 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.96-1",
+ "version": "1.1.96-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 c0a41f29ab7ea8b3d3869b41eedc5191ca7e1c03 Mon Sep 17 00:00:00 2001
From: Andrew Gable
Date: Fri, 2 Sep 2022 10:02:10 +0200
Subject: [PATCH 2/2] Merge pull request #10775 from
Expensify/revert-10334-update-react-native-svg
Revert "update react-native-svg version"
(cherry picked from commit c354f3ded094808480efab608a156ff9e487df71)
---
package-lock.json | 16 ++++++++--------
package.json | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 178b54e984fd..afc8b2c3ebf3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -77,7 +77,7 @@
"react-native-render-html": "6.3.1",
"react-native-safe-area-context": "^3.1.4",
"react-native-screens": "^3.10.1",
- "react-native-svg": "^13.1.0",
+ "react-native-svg": "^12.1.0",
"react-native-webview": "^11.17.2",
"react-pdf": "5.7.2",
"react-plaid-link": "3.3.2",
@@ -31790,16 +31790,16 @@
}
},
"node_modules/react-native-svg": {
- "version": "13.1.0",
- "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-13.1.0.tgz",
- "integrity": "sha512-drYa+0piaQ27xFEp1MxRBSu6eHbR37qQITKTHNOmPv1NhPUyZ5tH4ICWe7aTLlB2u6KEhpSHl63HJi3jpZFtvw==",
+ "version": "12.4.4",
+ "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-12.4.4.tgz",
+ "integrity": "sha512-LpcNlEVCURexqPAvQ9ne8KrPVfYz0wIDygwud8VMRmXLezysXzyQN/DTsjm1BO9lIfYp55WQsr3u3yW/vk6iiA==",
"dependencies": {
"css-select": "^5.1.0",
"css-tree": "^1.1.3"
},
"peerDependencies": {
"react": "*",
- "react-native": "*"
+ "react-native": ">=0.50.0"
}
},
"node_modules/react-native-svg-transformer": {
@@ -64391,9 +64391,9 @@
}
},
"react-native-svg": {
- "version": "13.1.0",
- "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-13.1.0.tgz",
- "integrity": "sha512-drYa+0piaQ27xFEp1MxRBSu6eHbR37qQITKTHNOmPv1NhPUyZ5tH4ICWe7aTLlB2u6KEhpSHl63HJi3jpZFtvw==",
+ "version": "12.4.4",
+ "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-12.4.4.tgz",
+ "integrity": "sha512-LpcNlEVCURexqPAvQ9ne8KrPVfYz0wIDygwud8VMRmXLezysXzyQN/DTsjm1BO9lIfYp55WQsr3u3yW/vk6iiA==",
"requires": {
"css-select": "^5.1.0",
"css-tree": "^1.1.3"
diff --git a/package.json b/package.json
index d2ad8014f922..7c2fd10acbc9 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
"react-native-render-html": "6.3.1",
"react-native-safe-area-context": "^3.1.4",
"react-native-screens": "^3.10.1",
- "react-native-svg": "^13.1.0",
+ "react-native-svg": "^12.1.0",
"react-native-webview": "^11.17.2",
"react-pdf": "5.7.2",
"react-plaid-link": "3.3.2",