From a50cb309d2a7546d0f4a85a263552f474ee5c305 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 7 Nov 2022 10:30:39 -0500
Subject: [PATCH 1/2] Merge pull request #12515 from
Expensify/version-BUILD-183606B4-2A91-480D-82E2-93D2FCE20D06
Update version to 1.2.24-1 on main
(cherry picked from commit 82c42e3c54b79a60823b0e805f7150d8a9a19fda)
---
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 87bbc2c53892..67710e460d53 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 1001022400
- versionName "1.2.24-0"
+ versionCode 1001022401
+ versionName "1.2.24-1"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index f6051ce0bc17..39ee4fd98989 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.24.0
+ 1.2.24.1
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 5f8f79dc388e..796763fdac4a 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.24.0
+ 1.2.24.1
diff --git a/package-lock.json b/package-lock.json
index 4cc0881f9df9..3567b5a54e50 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.24-0",
+ "version": "1.2.24-1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.24-0",
+ "version": "1.2.24-1",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index af9ee41310f0..6efd97b7920a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.24-0",
+ "version": "1.2.24-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 e337f6f43a2aa08b09105aa44e079cba1440cbba Mon Sep 17 00:00:00 2001
From: Carlos Martins
Date: Mon, 7 Nov 2022 08:24:36 -0700
Subject: [PATCH 2/2] Merge pull request #12510 from
Expensify/jules-resolveAndroidBuildIssue
[NO-QA] Resolve upstream ReactNative android build blocker
(cherry picked from commit e50d8f43cb98c850d1d32f5c9a507259061524ad)
---
android/build.gradle | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/android/build.gradle b/android/build.gradle
index 49fa013fac6b..1eb91727e016 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -42,6 +42,10 @@ allprojects {
configurations.all {
resolutionStrategy {
force 'org.xerial:sqlite-jdbc:3.34.0'
+
+ // Manually set the react-native version to resolve this upstream issue: https://github.com/facebook/react-native/issues/35210
+ def REACT_NATIVE_VERSION = new File(['node', '--print',"JSON.parse(require('fs').readFileSync(require.resolve('react-native/package.json'), 'utf-8')).version"].execute(null, rootDir).text.trim())
+ force "com.facebook.react:react-native:" + REACT_NATIVE_VERSION
}
}
repositories {