Skip to content

Commit 60a982b

Browse files
bmartybmarty
authored
Merge branch 'develop' into feature/bma/upUpdate
2 parents 6cadad3 + 1dcd608 commit 60a982b

File tree

1,276 files changed

+10317
-4920
lines changed

Some content is hidden

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

1,276 files changed

+10317
-4920
lines changed

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ jobs:
4646
ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
4747
ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
4848
ELEMENT_ANDROID_SENTRY_DSN: ${{ secrets.ELEMENT_ANDROID_SENTRY_DSN }}
49+
ELEMENT_CALL_SENTRY_DSN: ${{ secrets.ELEMENT_CALL_SENTRY_DSN }}
50+
ELEMENT_CALL_POSTHOG_API_HOST: ${{ secrets.ELEMENT_CALL_POSTHOG_API_HOST }}
51+
ELEMENT_CALL_POSTHOG_API_KEY: ${{ secrets.ELEMENT_CALL_POSTHOG_API_KEY }}
52+
ELEMENT_CALL_RAGESHAKE_URL: ${{ secrets.ELEMENT_CALL_RAGESHAKE_URL }}
4953
run: ./gradlew :app:assembleGplayDebug app:assembleFDroidDebug -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
5054
- name: Upload debug APKs
5155
if: ${{ matrix.variant == 'debug' }}
@@ -65,7 +69,7 @@ jobs:
6569
retention-days: 5
6670
overwrite: true
6771
if-no-files-found: error
68-
- uses: rnkdsh/action-upload-diawi@v1.5.7
72+
- uses: rnkdsh/action-upload-diawi@v1.5.8
6973
id: diawi
7074
# Do not fail the whole build if Diawi upload fails
7175
continue-on-error: true
@@ -89,7 +93,7 @@ jobs:
8993
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9094
- name: Compile release sources
9195
if: ${{ matrix.variant == 'release' }}
92-
run: ./gradlew compileReleaseSources -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
96+
run: ./gradlew bundleGplayRelease -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
9397
- name: Compile nightly sources
9498
if: ${{ matrix.variant == 'nightly' }}
9599
run: ./gradlew compileGplayNightlySources -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES

‎.github/workflows/build_enterprise.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
# https://github.com/actions/checkout/issues/881
3434
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
3535
- name: Add SSH private keys for submodule repositories
36-
uses: webfactory/ssh-agent@v0.9.0
36+
uses: webfactory/ssh-agent@v0.9.1
3737
with:
3838
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
3939
- name: Clone submodules
@@ -54,6 +54,10 @@ jobs:
5454
ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
5555
ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
5656
ELEMENT_ANDROID_SENTRY_DSN: ${{ secrets.ELEMENT_ANDROID_SENTRY_DSN }}
57+
ELEMENT_CALL_SENTRY_DSN: ${{ secrets.ELEMENT_CALL_SENTRY_DSN }}
58+
ELEMENT_CALL_POSTHOG_API_HOST: ${{ secrets.ELEMENT_CALL_POSTHOG_API_HOST }}
59+
ELEMENT_CALL_POSTHOG_API_KEY: ${{ secrets.ELEMENT_CALL_POSTHOG_API_KEY }}
60+
ELEMENT_CALL_RAGESHAKE_URL: ${{ secrets.ELEMENT_CALL_RAGESHAKE_URL }}
5761
run: ./gradlew :app:assembleGplayDebug -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
5862
- name: Upload debug Enterprise APKs
5963
if: ${{ matrix.variant == 'debug' }}

‎.github/workflows/danger.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v4
1313
- name: Add SSH private keys for submodule repositories
14-
uses: webfactory/ssh-agent@v0.9.0
14+
uses: webfactory/ssh-agent@v0.9.1
1515
with:
1616
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
1717
- name: Clone submodules

‎.github/workflows/nightly.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ jobs:
3030
ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
3131
ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
3232
ELEMENT_ANDROID_SENTRY_DSN: ${{ secrets.ELEMENT_ANDROID_SENTRY_DSN }}
33+
ELEMENT_CALL_SENTRY_DSN: ${{ secrets.ELEMENT_CALL_SENTRY_DSN }}
34+
ELEMENT_CALL_POSTHOG_API_HOST: ${{ secrets.ELEMENT_CALL_POSTHOG_API_HOST }}
35+
ELEMENT_CALL_POSTHOG_API_KEY: ${{ secrets.ELEMENT_CALL_POSTHOG_API_KEY }}
36+
ELEMENT_CALL_RAGESHAKE_URL: ${{ secrets.ELEMENT_CALL_RAGESHAKE_URL }}
3337
ELEMENT_ANDROID_NIGHTLY_KEYID: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_KEYID }}
3438
ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD }}
3539
ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD }}

‎.github/workflows/nightly_enterprise.yml‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎.github/workflows/pull_request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Pull Request
22
on:
3-
pull_request:
3+
pull_request_target:
44
types: [ opened, edited, labeled, unlabeled, synchronize ]
55
workflow_call:
66
secrets:

‎.github/workflows/quality.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121
- name: Add SSH private keys for submodule repositories
22-
uses: webfactory/ssh-agent@v0.9.0
22+
uses: webfactory/ssh-agent@v0.9.1
2323
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
2424
with:
2525
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -77,7 +77,7 @@ jobs:
7777
# https://github.com/actions/checkout/issues/881
7878
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
7979
- name: Add SSH private keys for submodule repositories
80-
uses: webfactory/ssh-agent@v0.9.0
80+
uses: webfactory/ssh-agent@v0.9.1
8181
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
8282
with:
8383
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -117,7 +117,7 @@ jobs:
117117
# https://github.com/actions/checkout/issues/881
118118
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
119119
- name: Add SSH private keys for submodule repositories
120-
uses: webfactory/ssh-agent@v0.9.0
120+
uses: webfactory/ssh-agent@v0.9.1
121121
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
122122
with:
123123
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -161,7 +161,7 @@ jobs:
161161
# https://github.com/actions/checkout/issues/881
162162
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
163163
- name: Add SSH private keys for submodule repositories
164-
uses: webfactory/ssh-agent@v0.9.0
164+
uses: webfactory/ssh-agent@v0.9.1
165165
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
166166
with:
167167
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -201,7 +201,7 @@ jobs:
201201
# https://github.com/actions/checkout/issues/881
202202
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
203203
- name: Add SSH private keys for submodule repositories
204-
uses: webfactory/ssh-agent@v0.9.0
204+
uses: webfactory/ssh-agent@v0.9.1
205205
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
206206
with:
207207
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -241,7 +241,7 @@ jobs:
241241
# https://github.com/actions/checkout/issues/881
242242
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
243243
- name: Add SSH private keys for submodule repositories
244-
uses: webfactory/ssh-agent@v0.9.0
244+
uses: webfactory/ssh-agent@v0.9.1
245245
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
246246
with:
247247
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ jobs:
3232
ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
3333
ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
3434
ELEMENT_ANDROID_SENTRY_DSN: ${{ secrets.ELEMENT_ANDROID_SENTRY_DSN }}
35+
ELEMENT_CALL_SENTRY_DSN: ${{ secrets.ELEMENT_CALL_SENTRY_DSN }}
36+
ELEMENT_CALL_POSTHOG_API_HOST: ${{ secrets.ELEMENT_CALL_POSTHOG_API_HOST }}
37+
ELEMENT_CALL_POSTHOG_API_KEY: ${{ secrets.ELEMENT_CALL_POSTHOG_API_KEY }}
38+
ELEMENT_CALL_RAGESHAKE_URL: ${{ secrets.ELEMENT_CALL_RAGESHAKE_URL }}
3539
run: ./gradlew bundleGplayRelease $CI_GRADLE_ARG_PROPERTIES
3640
- name: Upload bundle as artifact
3741
uses: actions/upload-artifact@v4
@@ -50,7 +54,7 @@ jobs:
5054
steps:
5155
- uses: actions/checkout@v4
5256
- name: Add SSH private keys for submodule repositories
53-
uses: webfactory/ssh-agent@v0.9.0
57+
uses: webfactory/ssh-agent@v0.9.1
5458
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
5559
with:
5660
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
# https://github.com/actions/checkout/issues/881
4040
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
4141
- name: Add SSH private keys for submodule repositories
42-
uses: webfactory/ssh-agent@v0.9.0
42+
uses: webfactory/ssh-agent@v0.9.1
4343
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
4444
with:
4545
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ captures/
4343
.idea/.name
4444
.idea/androidTestResultsUserPreferences.xml
4545
.idea/assetWizardSettings.xml
46+
.idea/AndroidProjectSystem.xml
4647
.idea/compiler.xml
4748
.idea/deploymentTargetDropDown.xml
4849
.idea/deploymentTargetSelector.xml

0 commit comments

Comments
 (0)