From c27933cef1694e5df96e134d40a898aa9f511afb Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Tue, 25 Oct 2022 17:24:40 -0400 Subject: [PATCH 1/2] Merge pull request #12133 from Expensify/version-BUILD-405082A3-DC0C-48A1-B90A-2F3B39872D22 Update version to 1.2.19-2 on main (cherry picked from commit f4a4de804cddad073fbb121fe085c4695cfa6b8b) --- 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 2ff3d98504a4..f32016ad3d95 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 1001021901 - versionName "1.2.19-1" + versionCode 1001021902 + versionName "1.2.19-2" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index af5354ff98e6..ca5783f01108 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.2.19.1 + 1.2.19.2 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 5ef9d0cd595b..77b30f4573c7 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.2.19.1 + 1.2.19.2 diff --git a/package-lock.json b/package-lock.json index 5981f9dfe557..4f823ed024f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.2.19-1", + "version": "1.2.19-2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.2.19-1", + "version": "1.2.19-2", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index c8102169b093..6828a2fbca60 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.2.19-1", + "version": "1.2.19-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 8ebb759572872fe31ea7537e3028a8a46143551b Mon Sep 17 00:00:00 2001 From: Cristi Paval Date: Wed, 26 Oct 2022 00:17:23 +0300 Subject: [PATCH 2/2] Merge pull request #11996 from Expensify/cristi_update-expensify-common Update expensify-common (cherry picked from commit 883f84fcc3cee343b7a6ea264733e2124f167c00) --- 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 4f823ed024f7..27e210cc9c4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,7 +38,7 @@ "dom-serializer": "^0.2.2", "domhandler": "^4.3.0", "dotenv": "^8.2.0", - "expensify-common": "git+https://github.com/Expensify/expensify-common.git#03a86215c0ae2bc4e7978e1ca9717fbc7fdea11b", + "expensify-common": "git+https://github.com/Expensify/expensify-common.git#6010b3c49a16f63ee9cecc0c720f6d10395775ef", "fbjs": "^3.0.2", "file-loader": "^6.0.0", "html-entities": "^1.3.1", @@ -23948,8 +23948,8 @@ }, "node_modules/expensify-common": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#03a86215c0ae2bc4e7978e1ca9717fbc7fdea11b", - "integrity": "sha512-LWMhx7czsv3l6oJ7ILfYHFbllmAcPVzDTZHpXFtzLJh2lP4Wuukc0gB7MQX2EwkZ+VV2QrZj4gPkRMbr95DOKg==", + "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#6010b3c49a16f63ee9cecc0c720f6d10395775ef", + "integrity": "sha512-QRKmQUEVzdEwOJEsh1XFhcGdSl+taPdHYTUZt0Bdbb9SyQvBHX4g6/NqMIfQRYiBq6q3eKpAd4nTKmkaHAfKsA==", "license": "MIT", "dependencies": { "classnames": "2.3.1", @@ -61329,9 +61329,9 @@ } }, "expensify-common": { - "version": "git+ssh://git@github.com/Expensify/expensify-common.git#03a86215c0ae2bc4e7978e1ca9717fbc7fdea11b", - "integrity": "sha512-LWMhx7czsv3l6oJ7ILfYHFbllmAcPVzDTZHpXFtzLJh2lP4Wuukc0gB7MQX2EwkZ+VV2QrZj4gPkRMbr95DOKg==", - "from": "expensify-common@git+https://github.com/Expensify/expensify-common.git#03a86215c0ae2bc4e7978e1ca9717fbc7fdea11b", + "version": "git+ssh://git@github.com/Expensify/expensify-common.git#6010b3c49a16f63ee9cecc0c720f6d10395775ef", + "integrity": "sha512-QRKmQUEVzdEwOJEsh1XFhcGdSl+taPdHYTUZt0Bdbb9SyQvBHX4g6/NqMIfQRYiBq6q3eKpAd4nTKmkaHAfKsA==", + "from": "expensify-common@git+https://github.com/Expensify/expensify-common.git#6010b3c49a16f63ee9cecc0c720f6d10395775ef", "requires": { "classnames": "2.3.1", "clipboard": "2.0.4", diff --git a/package.json b/package.json index 6828a2fbca60..b6a3e37bc51d 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "dom-serializer": "^0.2.2", "domhandler": "^4.3.0", "dotenv": "^8.2.0", - "expensify-common": "git+https://github.com/Expensify/expensify-common.git#03a86215c0ae2bc4e7978e1ca9717fbc7fdea11b", + "expensify-common": "git+https://github.com/Expensify/expensify-common.git#6010b3c49a16f63ee9cecc0c720f6d10395775ef", "fbjs": "^3.0.2", "file-loader": "^6.0.0", "html-entities": "^1.3.1",