From 85c79cda14ca8fdf6e8632222465acafcb893d02 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 11 Apr 2023 18:34:05 -0400
Subject: [PATCH 1/2] Merge pull request #17311 from
Expensify/version-BUILD-4A958FB9-2FA0-464B-ACA7-43A97AEA542E
Update version to 1.2.99-3 on main
(cherry picked from commit 343c24268960187d9567ae94f8b584f3b554dea6)
---
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 df7bae0a3752..84472ed88149 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001029902
- versionName "1.2.99-2"
+ versionCode 1001029903
+ versionName "1.2.99-3"
}
splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 2f3dfaaef98a..640e1ba85bfb 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.99.2
+ 1.2.99.3
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 6d501dd91eb1..6e3a8ef4005e 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.99.2
+ 1.2.99.3
diff --git a/package-lock.json b/package-lock.json
index adb8b0866f09..c6aa9934671a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.99-2",
+ "version": "1.2.99-3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.99-2",
+ "version": "1.2.99-3",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 2f11474ecc72..304234135bd9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.99-2",
+ "version": "1.2.99-3",
"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 8ce08968d395ffa04176dfafe4a2bcecda1c146b Mon Sep 17 00:00:00 2001
From: Francois Laithier
Date: Tue, 11 Apr 2023 15:27:02 -0700
Subject: [PATCH 2/2] Merge pull request #17309 from Expensify/andrew-gemfile
(cherry picked from commit 024a9adcc783a53656f8f1b127784d242b6679e4)
---
Gemfile.lock | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Gemfile.lock b/Gemfile.lock
index f34ae1c7c05c..f684ed37cf8d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,6 +14,8 @@ GEM
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
+ apktools (0.7.4)
+ rubyzip (~> 2.0)
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
@@ -155,6 +157,10 @@ GEM
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
+ fastlane-plugin-aws_s3 (2.1.0)
+ apktools (~> 0.7)
+ aws-sdk-s3 (~> 1)
+ mime-types (~> 3.3)
ffi (1.15.5)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
@@ -207,6 +213,9 @@ GEM
json (2.6.3)
jwt (2.5.0)
memoist (0.16.2)
+ mime-types (3.4.1)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2023.0218.1)
mini_magick (4.11.0)
mini_mime (1.1.2)
minitest (5.18.0)
@@ -283,6 +292,7 @@ PLATFORMS
DEPENDENCIES
cocoapods (~> 1.11.3)
fastlane (~> 2)
+ fastlane-plugin-aws_s3
xcpretty (~> 0)
BUNDLED WITH