From deae321d2d9fbd4b09c6fdff1e3716c48360cc55 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 24 Oct 2022 06:44:37 -0400
Subject: [PATCH 1/2] Merge pull request #12085 from
Expensify/version-BUILD-CA112F69-E79C-4992-AC72-06743469D781
Update version to 1.2.18-8 on main
(cherry picked from commit 245ea00985ead662c3c07a93b1a69651678cee97)
---
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 10d866b13664..ab8b8382a294 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 1001021807
- versionName "1.2.18-7"
+ versionCode 1001021808
+ versionName "1.2.18-8"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 3d65223772d5..4ba9ecefa78f 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.18.7
+ 1.2.18.8
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index a67586a37e38..f9855b399cbe 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.18.7
+ 1.2.18.8
diff --git a/package-lock.json b/package-lock.json
index 5e65369ebb84..96ea487100db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.18-7",
+ "version": "1.2.18-8",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.18-7",
+ "version": "1.2.18-8",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 7199dab7f071..a23a1943893e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.18-7",
+ "version": "1.2.18-8",
"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 10b67b260cd11b0e5649303891e1a13d8a8f7f83 Mon Sep 17 00:00:00 2001
From: Jules
Date: Mon, 24 Oct 2022 11:30:43 +0100
Subject: [PATCH 2/2] Merge pull request #12084 from
Expensify/Rory-FixAutoSigningPods
[No QA] Specify developer team to sign generated projects
(cherry picked from commit 704b8b00fa8512885527f985f4b4327b79c4ad48)
---
ios/Podfile | 8 ++++++++
ios/Podfile.lock | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/ios/Podfile b/ios/Podfile
index f42d309b7a9e..c6182b7f4584 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -49,5 +49,13 @@ target 'NewExpensify' do
installer.pods_project.build_configurations.each do |config|
config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
end
+
+ installer.generated_projects.each do |project|
+ project.targets.each do |target|
+ target.build_configurations.each do |config|
+ config.build_settings["DEVELOPMENT_TEAM"] = "368M544MTT"
+ end
+ end
+ end
end
end
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index c54a14feeaf9..25ea848b0b92 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1023,6 +1023,6 @@ SPEC CHECKSUMS:
Yoga: 1f02ef4ce4469aefc36167138441b27d988282b1
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
-PODFILE CHECKSUM: 5745ec909229219e7469609dba23118be023f564
+PODFILE CHECKSUM: ce36bd7b1d5b19fefa2a79a65e6762d3328cb8e0
COCOAPODS: 1.11.3