Skip to content

Commit ac7dd6b

Browse files
ganfraganfra
committed
Merge branch 'release/26.03.4'
2 parents 7584176 + ee13774 commit ac7dd6b

File tree

783 files changed

+5046
-3372
lines changed

Some content is hidden

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

783 files changed

+5046
-3372
lines changed

‎.github/pull_request_template.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
<!-- Please read [CONTRIBUTING.md](https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
1+
<!--
2+
3+
Please read [CONTRIBUTING.md](https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md) before submitting your pull request.
4+
5+
Are you adding a new feature? Keep in mind that it needs to be added to [the iOS client](https://github.com/element-hq/element-x-ios) too, unless it's related to an Android OS only behaviour.
6+
7+
**IMPORTANT:** if you are adding new screens or modifying existing ones, this needs acceptance from the product and design teams before being merged. For this, it's better to start with a [feature request issue](https://github.com/element-hq/element-x-android/issues/new?template=enhancement.yml) describing the change you want to make and the motivation behind it instead of directly creating a pull request. This will allow the product and design teams to give feedback on the change before you start working on it, and avoid you doing work that might end up being rejected.
8+
9+
-->
210

311
## Content
412

‎.github/renovate.json‎

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

‎.github/renovate.json5‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:recommended",
5+
],
6+
"labels": [
7+
"PR-Dependencies",
8+
],
9+
"ignoreDeps": [
10+
"string:app_name",
11+
"gradle",
12+
],
13+
"minimumReleaseAge": "7 days",
14+
"packageRules": [
15+
{
16+
"matchPackageNames": [
17+
"org.matrix.rustcomponents:sdk-android",
18+
"/^io.element.android/",
19+
],
20+
"minimumReleaseAge": null,
21+
},
22+
{
23+
"groupName": "kotlin",
24+
"matchPackageNames": [
25+
"/^org.jetbrains.kotlin/",
26+
"/^com.google.devtools.ksp/",
27+
"/^androidx.compose.compiler/",
28+
],
29+
},
30+
{
31+
"versioning": "semver",
32+
"matchPackageNames": [
33+
"/^org.maplibre/",
34+
"/^org.jetbrains.kotlinx:kotlinx-datetime/",
35+
],
36+
},
37+
{
38+
// Limit PostHog Android upgrade to one PR per month, the first day of the month
39+
"matchPackageNames": [
40+
"com.posthog:posthog-android",
41+
],
42+
"schedule": [
43+
"* * 1 * *",
44+
]
45+
},
46+
],
47+
}

‎.github/workflows/build_enterprise.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
5151
persist-credentials: false
5252
- name: Add SSH private keys for submodule repositories
53-
uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
53+
uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
5454
with:
5555
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
5656
- name: Clone submodules

‎.github/workflows/danger.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
persist-credentials: false
1717
- name: Add SSH private keys for submodule repositories
18-
uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
18+
uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
1919
with:
2020
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
2121
- name: Clone submodules

‎.github/workflows/fork-pr-notice.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ permissions: {}
1212
jobs:
1313
welcome:
1414
runs-on: ubuntu-latest
15+
permissions:
16+
# Require to comment the PR.
17+
pull-requests: write
1518
name: Welcome comment
1619
# Only display it if base repo (upstream) is different from HEAD repo (possibly a fork)
1720
if: github.event.pull_request.base.repo.full_name != github.event.pull_request.head.repo.full_name

‎.github/workflows/maestro-local.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
ref: ${{ github.ref }}
8787
persist-credentials: false
8888
- name: Download APK artifact from previous job
89-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
89+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
9090
with:
9191
name: elementx-apk-maestro
9292
- name: Enable KVM group perms
@@ -98,7 +98,7 @@ jobs:
9898
run: curl -fsSL "https://get.maestro.mobile.dev" | bash
9999
- name: Run Maestro tests in emulator
100100
id: maestro_test
101-
uses: reactivecircus/android-emulator-runner@b530d96654c385303d652368551fb075bc2f0b6b # v2.35.0
101+
uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a # v2.37.0
102102
continue-on-error: true
103103
env:
104104
MAESTRO_USERNAME: maestroelement

‎.github/workflows/pull_request.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ jobs:
5454
close-if-fork-develop:
5555
name: Forbid develop branch fork contributions
5656
runs-on: ubuntu-latest
57+
permissions:
58+
# Require to comment and close the PR.
59+
pull-requests: write
5760
if: >
5861
github.event.action == 'opened' &&
5962
github.event.pull_request.head.ref == 'develop' &&

‎.github/workflows/quality.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
persist-credentials: false
3939
- name: Add SSH private keys for submodule repositories
40-
uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
40+
uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
4141
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
4242
with:
4343
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -100,7 +100,7 @@ jobs:
100100
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
101101
persist-credentials: false
102102
- name: Add SSH private keys for submodule repositories
103-
uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
103+
uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
104104
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
105105
with:
106106
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -141,7 +141,7 @@ jobs:
141141
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
142142
persist-credentials: false
143143
- name: Add SSH private keys for submodule repositories
144-
uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
144+
uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
145145
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
146146
with:
147147
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -175,7 +175,7 @@ jobs:
175175
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
176176
persist-credentials: false
177177
- name: Add SSH private keys for submodule repositories
178-
uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
178+
uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
179179
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
180180
with:
181181
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -220,7 +220,7 @@ jobs:
220220
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
221221
persist-credentials: false
222222
- name: Add SSH private keys for submodule repositories
223-
uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
223+
uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
224224
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
225225
with:
226226
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -261,7 +261,7 @@ jobs:
261261
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
262262
persist-credentials: false
263263
- name: Add SSH private keys for submodule repositories
264-
uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
264+
uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
265265
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
266266
with:
267267
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -302,7 +302,7 @@ jobs:
302302
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
303303
persist-credentials: false
304304
- name: Add SSH private keys for submodule repositories
305-
uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
305+
uses: webfactory/ssh-agent@e83874834305fe9a4a2997156cb26c5de65a8555 # v0.10.0
306306
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
307307
with:
308308
ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -351,7 +351,7 @@ jobs:
351351
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
352352
persist-credentials: false
353353
- name: Download reports from previous jobs
354-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
354+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
355355
- name: Prepare Danger
356356
if: always()
357357
run: |

‎.github/workflows/recordScreenshots.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ env:
1414

1515
jobs:
1616
record:
17+
permissions:
18+
# Need write permissions on PRs to remove the label "Record-Screenshots"
19+
pull-requests: write
1720
name: Record screenshots on branch ${{ github.event.pull_request.head.ref || github.ref_name }}
1821
runs-on: ubuntu-latest
1922
if: github.event_name == 'workflow_dispatch' || github.event.label.name == 'Record-Screenshots'

0 commit comments

Comments
 (0)