From d6a5f5b387edd07c53838bf61ac387ed9036b384 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Thu, 27 Oct 2022 07:55:20 -0400 Subject: [PATCH 1/2] Merge pull request #12179 from Expensify/version-BUILD-9F7ED7AD-D09B-4ED8-BE15-72D834FC4EF6 Update version to 1.2.20-1 on main (cherry picked from commit ad5384b8bc827395019a3448a4b1cf9730c33609) --- 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 2577b67d98a5..5cf74487f58c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -156,8 +156,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001022000 - versionName "1.2.20-0" + versionCode 1001022001 + versionName "1.2.20-1" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 8f2d26d21bbd..b19a64dcdd5a 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.2.20.0 + 1.2.20.1 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 2432a26fa500..1efd4dfd7272 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.2.20.0 + 1.2.20.1 diff --git a/package-lock.json b/package-lock.json index 7e289564a81e..afbb45680c96 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.2.20-0", + "version": "1.2.20-1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.2.20-0", + "version": "1.2.20-1", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 78b7ef4c8f96..51cf529dc730 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.2.20-0", + "version": "1.2.20-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 67b46509b5e3e177b9e8f58ca94ece936982bd68 Mon Sep 17 00:00:00 2001 From: Jules Date: Thu, 27 Oct 2022 12:48:16 +0100 Subject: [PATCH 2/2] Merge pull request #12176 from Expensify/jules-revert1aed093 Revert "Upgrade react-native-svg to 13.4.0" (cherry picked from commit 97545ed284c0702660d3d3bd95ca0b926fcea494) --- ios/Podfile.lock | 4 ++-- package-lock.json | 16 ++++++++-------- package.json | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 7a683166e44c..8932beea5ebd 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -624,7 +624,7 @@ PODS: - RNScreens (3.17.0): - React-Core - React-RCTImage - - RNSVG (13.4.0): + - RNSVG (12.4.4): - React-Core - SDWebImage (5.11.1): - SDWebImage/Core (= 5.11.1) @@ -1015,7 +1015,7 @@ SPEC CHECKSUMS: RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c RNReanimated: 6c980139eb3b043569a08b8cb3d92cdf46bd54fa RNScreens: 0df01424e9e0ed7827200d6ed1087ddd06c493f9 - RNSVG: 07dbd870b0dcdecc99b3a202fa37c8ca163caec2 + RNSVG: ecd661f380a07ba690c9c5929c475a44f432d674 SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 diff --git a/package-lock.json b/package-lock.json index afbb45680c96..ce7f29ec5f81 100644 --- a/package-lock.json +++ b/package-lock.json @@ -78,7 +78,7 @@ "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.17.0", - "react-native-svg": "^13.4.0", + "react-native-svg": "^12.4.4", "react-native-webview": "^11.17.2", "react-pdf": "5.7.2", "react-plaid-link": "3.3.2", @@ -35807,16 +35807,16 @@ } }, "node_modules/react-native-svg": { - "version": "13.4.0", - "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-13.4.0.tgz", - "integrity": "sha512-B3TwK+H0+JuRhYPzF21AgqMt4fjhCwDZ9QUtwNstT5XcslJBXC0FoTkdZo8IEb1Sv4suSqhZwlAY6lwOv3tHag==", + "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": { @@ -70502,9 +70502,9 @@ } }, "react-native-svg": { - "version": "13.4.0", - "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-13.4.0.tgz", - "integrity": "sha512-B3TwK+H0+JuRhYPzF21AgqMt4fjhCwDZ9QUtwNstT5XcslJBXC0FoTkdZo8IEb1Sv4suSqhZwlAY6lwOv3tHag==", + "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 51cf529dc730..0082b199479a 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "react-native-render-html": "6.3.1", "react-native-safe-area-context": "4.4.1", "react-native-screens": "3.17.0", - "react-native-svg": "^13.4.0", + "react-native-svg": "^12.4.4", "react-native-webview": "^11.17.2", "react-pdf": "5.7.2", "react-plaid-link": "3.3.2",