Skip to content

Commit 46f7bbe

Browse files
committed
Merge branch 'main' into travel/trip-room-preview
2 parents 42b5f3f + 9ec57c0 commit 46f7bbe

File tree

231 files changed

+1560
-2441
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+1560
-2441
lines changed

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,6 @@ jobs:
6565
PR_LIST: ${{ steps.getReleasePRList.outputs.PR_LIST }}
6666

6767
- name: 🚀 Create release to trigger production deploy 🚀
68-
run: gh release create ${{ env.PRODUCTION_VERSION }} --notes ${{ steps.getReleaseBody.outputs.RELEASE_BODY }}
68+
run: gh release create ${{ env.PRODUCTION_VERSION }} --generate-notes
6969
env:
7070
GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}

.github/workflows/platformDeploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
uses: actions/upload-artifact@v3
9898
with:
9999
name: android-sourcemap
100-
path: android/app/build/generated/sourcemaps/react/release/*.map
100+
path: android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map
101101

102102
- name: Upload Android version to GitHub artifacts
103103
if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ android {
107107
minSdkVersion rootProject.ext.minSdkVersion
108108
targetSdkVersion rootProject.ext.targetSdkVersion
109109
multiDexEnabled rootProject.ext.multiDexEnabled
110-
versionCode 1001048302
111-
versionName "1.4.83-2"
110+
versionCode 1001048500
111+
versionName "1.4.85-0"
112112
// Supported language variants must be declared here to avoid from being removed during the compilation.
113113
// This also helps us to not include unnecessary language variants in the APK.
114114
resConfigs "en", "es"

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ buildscript {
2929
classpath("com.google.firebase:firebase-crashlytics-gradle:2.7.1")
3030
classpath("com.google.firebase:perf-plugin:1.4.1")
3131
// Fullstory integration
32-
classpath ("com.fullstory:gradle-plugin-local:1.47.0")
32+
classpath ("com.fullstory:gradle-plugin-local:1.49.0")
3333

3434
// NOTE: Do not place your application dependencies here; they belong
3535
// in the individual module build.gradle files

assets/images/bed.svg

Lines changed: 1 addition & 1 deletion
Loading

assets/images/car-with-key.svg

Lines changed: 1 addition & 1 deletion
Loading

assets/images/check-circle.svg

Lines changed: 1 addition & 13 deletions
Loading

assets/images/checkmark-circle.svg

Lines changed: 1 addition & 3 deletions
Loading
Lines changed: 1 addition & 14 deletions
Loading

assets/images/crosshair.svg

Lines changed: 1 addition & 23 deletions
Loading
Lines changed: 1 addition & 18 deletions
Loading

assets/images/inbox.svg

Lines changed: 1 addition & 12 deletions
Loading

assets/images/money-search.svg

Lines changed: 1 addition & 16 deletions
Loading

0 commit comments

Comments
 (0)