From edcc9a5789d8887721520d238cee4ec3995bfb97 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Sat, 3 Dec 2022 09:46:21 -0500
Subject: [PATCH 1/2] Merge pull request #13305 from
Expensify/version-BUILD-43FD19BB-BB26-4ED3-848F-981DB9CB4A4B
Update version to 1.2.36-1 on main
(cherry picked from commit 2e8d90736a19de0bf0332fb36afc42bab074434f)
---
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 d247d95bf458..773703485ee1 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 1001023600
- versionName "1.2.36-0"
+ versionCode 1001023601
+ versionName "1.2.36-1"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 23e9919fac24..ba2aefa9279f 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.36.0
+ 1.2.36.1
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index f602c4e10bfa..1fb5af250556 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.36.0
+ 1.2.36.1
diff --git a/package-lock.json b/package-lock.json
index b203d340d7aa..ffbcdc384931 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.36-0",
+ "version": "1.2.36-1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.36-0",
+ "version": "1.2.36-1",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 35e13db600f6..98e7b9a7d513 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.36-0",
+ "version": "1.2.36-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 cc73cfca6d785f47a961466bb8cbb4d756f2f1c6 Mon Sep 17 00:00:00 2001
From: Vivek Kumar <35863227+techievivek@users.noreply.github.com>
Date: Sat, 3 Dec 2022 20:09:05 +0530
Subject: [PATCH 2/2] Merge pull request #13284 from Expensify/andrew-onfido
Update Onfido to latest to resolve deploy issues
(cherry picked from commit e2dcf7a6355504e632a5958cb024987738162e32)
---
android/app/build.gradle | 4 ++++
android/build.gradle | 4 ++--
ios/Podfile.lock | 46 ++++++++++++++++++++--------------------
package-lock.json | 18 ++++++++--------
package.json | 2 +-
5 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 773703485ee1..62303fef6a80 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -289,6 +289,10 @@ dependencies {
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+ def lifecycle_version = "2.5.0"
+ implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+ implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
exclude group:'com.facebook.fbjni'
}
diff --git a/android/build.gradle b/android/build.gradle
index a35d82861347..ad1efd01ff98 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -3,8 +3,8 @@
buildscript {
ext {
minSdkVersion = 21
- compileSdkVersion = 31
- targetSdkVersion = 31
+ compileSdkVersion = 32
+ targetSdkVersion = 32
if (System.properties['os.arch'] == "aarch64") {
// For M1 Users we need to use the NDK 24 which added support for aarch64
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 00b569a90e48..c696014a9b31 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -181,45 +181,45 @@ PODS:
- GoogleUtilities/Environment (~> 7.7)
- nanopb (< 2.30910.0, >= 2.30908.0)
- PromisesObjC (< 3.0, >= 1.2)
- - GoogleUtilities/AppDelegateSwizzler (7.7.0):
+ - GoogleUtilities/AppDelegateSwizzler (7.10.0):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- - GoogleUtilities/Environment (7.7.0):
+ - GoogleUtilities/Environment (7.10.0):
- PromisesObjC (< 3.0, >= 1.2)
- - GoogleUtilities/ISASwizzler (7.7.0)
- - GoogleUtilities/Logger (7.7.0):
+ - GoogleUtilities/ISASwizzler (7.10.0)
+ - GoogleUtilities/Logger (7.10.0):
- GoogleUtilities/Environment
- - GoogleUtilities/MethodSwizzler (7.7.0):
+ - GoogleUtilities/MethodSwizzler (7.10.0):
- GoogleUtilities/Logger
- - GoogleUtilities/Network (7.7.0):
+ - GoogleUtilities/Network (7.10.0):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Reachability
- - "GoogleUtilities/NSData+zlib (7.7.0)"
- - GoogleUtilities/Reachability (7.7.0):
+ - "GoogleUtilities/NSData+zlib (7.10.0)"
+ - GoogleUtilities/Reachability (7.10.0):
- GoogleUtilities/Logger
- - GoogleUtilities/UserDefaults (7.7.0):
+ - GoogleUtilities/UserDefaults (7.10.0):
- GoogleUtilities/Logger
- hermes-engine (0.70.4)
- libevent (2.1.12)
- - libwebp (1.2.3):
- - libwebp/demux (= 1.2.3)
- - libwebp/mux (= 1.2.3)
- - libwebp/webp (= 1.2.3)
- - libwebp/demux (1.2.3):
+ - libwebp (1.2.4):
+ - libwebp/demux (= 1.2.4)
+ - libwebp/mux (= 1.2.4)
+ - libwebp/webp (= 1.2.4)
+ - libwebp/demux (1.2.4):
- libwebp/webp
- - libwebp/mux (1.2.3):
+ - libwebp/mux (1.2.4):
- libwebp/demux
- - libwebp/webp (1.2.3)
+ - libwebp/webp (1.2.4)
- nanopb (2.30908.0):
- nanopb/decode (= 2.30908.0)
- nanopb/encode (= 2.30908.0)
- nanopb/decode (2.30908.0)
- nanopb/encode (2.30908.0)
- - Onfido (26.0.1)
- - onfido-react-native-sdk (6.0.0):
- - Onfido (= 26.0.1)
+ - Onfido (27.0.0)
+ - onfido-react-native-sdk (7.0.1):
+ - Onfido (= 27.0.0)
- React
- OpenSSL-Universal (1.1.1100)
- Permission-Camera (3.6.1):
@@ -945,13 +945,13 @@ SPEC CHECKSUMS:
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
GoogleAppMeasurement: 5ba1164e3c844ba84272555e916d0a6d3d977e91
GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f
- GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1
+ GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95
hermes-engine: 3623325e0d0676a45fbc544d72c57dd79fce7446
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
- libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c
+ libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
- Onfido: 91935f0dcee9a6647fdb386fa87cb4af9d9a3c70
- onfido-react-native-sdk: bc72114ac430a2636cd2f02972ddf5b8b3b397c6
+ Onfido: bdbc3ed45598aa106ab2ea021d94e2e28c6b5be3
+ onfido-react-native-sdk: 5856e76fbfc0eb7b70b0f76fa1059830932a5c88
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
Permission-Camera: bf6791b17c7f614b6826019fcfdcc286d3a107f6
Permission-LocationAccuracy: 76df17de5c6b8bc2eee34e61ee92cdd7a864c73d
diff --git a/package-lock.json b/package-lock.json
index ffbcdc384931..dbe0d90e324e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
"@formatjs/intl-numberformat": "^6.2.5",
"@formatjs/intl-pluralrules": "^4.0.13",
"@oguzhnatly/react-native-image-manipulator": "github:Expensify/react-native-image-manipulator#c5f654fc9d0ad7cc5b89d50b34ecf8b0e3f4d050",
- "@onfido/react-native-sdk": "6.0.0",
+ "@onfido/react-native-sdk": "7.0.1",
"@pieter-pot/react-native-fast-image": "8.5.11",
"@react-native-async-storage/async-storage": "^1.17.10",
"@react-native-community/cameraroll": "git+https://github.com/react-native-cameraroll/react-native-cameraroll.git#3f0aed96db68e134f199171c7b06c1b4d6cb382b",
@@ -4157,12 +4157,12 @@
}
},
"node_modules/@onfido/react-native-sdk": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/@onfido/react-native-sdk/-/react-native-sdk-6.0.0.tgz",
- "integrity": "sha512-TJWeiEh0Vil37/Xm9H+uiOpiuYD2NhOhixdvaAkohTzLI3uUNiG7bph66jCUa+SpqFURQdCZMYWFwHwj2nXs2Q==",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/@onfido/react-native-sdk/-/react-native-sdk-7.0.1.tgz",
+ "integrity": "sha512-nhjByw/YyTACvkDWX2QtCzYmqkrDtSBJxYYgJjPuKvPRVIJhrny3bIm0DzAi1hWyIM2ZsKW/MSQxerGhR9FQaw==",
"peerDependencies": {
- "react": ">=16.8.1",
- "react-native": ">=0.60.0-rc.0 <1.0.x"
+ "react": ">=17.0.0",
+ "react-native": ">=0.68.2 <1.0.x"
}
},
"node_modules/@pieter-pot/react-native-fast-image": {
@@ -45696,9 +45696,9 @@
}
},
"@onfido/react-native-sdk": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/@onfido/react-native-sdk/-/react-native-sdk-6.0.0.tgz",
- "integrity": "sha512-TJWeiEh0Vil37/Xm9H+uiOpiuYD2NhOhixdvaAkohTzLI3uUNiG7bph66jCUa+SpqFURQdCZMYWFwHwj2nXs2Q==",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/@onfido/react-native-sdk/-/react-native-sdk-7.0.1.tgz",
+ "integrity": "sha512-nhjByw/YyTACvkDWX2QtCzYmqkrDtSBJxYYgJjPuKvPRVIJhrny3bIm0DzAi1hWyIM2ZsKW/MSQxerGhR9FQaw==",
"requires": {}
},
"@pieter-pot/react-native-fast-image": {
diff --git a/package.json b/package.json
index 98e7b9a7d513..368118f97925 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
"@formatjs/intl-numberformat": "^6.2.5",
"@formatjs/intl-pluralrules": "^4.0.13",
"@oguzhnatly/react-native-image-manipulator": "github:Expensify/react-native-image-manipulator#c5f654fc9d0ad7cc5b89d50b34ecf8b0e3f4d050",
- "@onfido/react-native-sdk": "6.0.0",
+ "@onfido/react-native-sdk": "7.0.1",
"@pieter-pot/react-native-fast-image": "8.5.11",
"@react-native-async-storage/async-storage": "^1.17.10",
"@react-native-community/cameraroll": "git+https://github.com/react-native-cameraroll/react-native-cameraroll.git#3f0aed96db68e134f199171c7b06c1b4d6cb382b",