Skip to content

Commit

Permalink
Merge pull request #3185 from Expensify/main
Browse files Browse the repository at this point in the history
  • Loading branch information
OSBotify authored May 27, 2021
2 parents aa7b079 + c650ae4 commit 968596c
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 19 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001005503
versionName "1.0.55-3"
versionCode 1001005600
versionName "1.0.56-0"
}
splits {
abi {
Expand Down
20 changes: 9 additions & 11 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,15 @@ platform :ios do

upload_to_testflight(
api_key_path: "./ios/ios-fastlane-json-key.json",
distribute_external: true,
reject_build_waiting_for_review: true,
# TODO: Remove skip_waiting_for_build_processing when https://github.com/fastlane/fastlane/issues/18408 is resolved
# See: https://github.com/Expensify/Expensify.cash/pull/1984 for more information
skip_waiting_for_build_processing: true,
# TODO: Set distribute_external back to true when https://github.com/fastlane/fastlane/issues/18408 is resolved
# See: https://github.com/Expensify/Expensify.cash/pull/1984 for more information
distribute_external: false,
# TODO: Set reject_build_waiting_for_review back to true when https://github.com/fastlane/fastlane/issues/18408 is resolved
# See: https://github.com/Expensify/Expensify.cash/pull/1984 for more information
reject_build_waiting_for_review: false,
changelog: "Thank you for beta testing Expensify.cash, this version includes bug fixes and improvements.",
groups: ["Beta"],
demo_account_required: true,
Expand All @@ -129,15 +136,6 @@ platform :ios do
}
)

# TODO: Remove this Exception handling when https://github.com/fastlane/fastlane/issues/18408 is resolved
# See: https://github.com/Expensify/Expensify.cash/pull/3166 for more information
rescue Exception => e
if e.message.include? "Another build is in review"
UI.important("Another build is already in external beta review. Skipping external beta review submission")
else
raise
end

upload_symbols_to_crashlytics(
dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH],
gsp_path: "./ios/GoogleService-Info.plist",
Expand Down
4 changes: 2 additions & 2 deletions ios/ExpensifyCash/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.55</string>
<string>1.0.56</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.0.55.3</string>
<string>1.0.56.0</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
4 changes: 2 additions & 2 deletions ios/ExpensifyCashTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.55</string>
<string>1.0.56</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0.55.3</string>
<string>1.0.56.0</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
"version": "1.0.55-3",
"version": "1.0.56-0",
"author": "Expensify, Inc.",
"homepage": "https://expensify.cash",
"description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
Expand Down

0 comments on commit 968596c

Please sign in to comment.