Skip to content

Commit 48d53d7

Browse files
committed
Merge branch 'release/0.4.0'
2 parents 1952bfc + 0577476 commit 48d53d7

File tree

2,419 files changed

+26677
-14792
lines changed

Some content is hidden

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

2,419 files changed

+26677
-14792
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
**/snapshots/**/*.png filter=lfs diff=lfs merge=lfs -text
22
**/docs/images-lfs/*.png filter=lfs diff=lfs merge=lfs -text
3+
libraries/mediaupload/impl/src/test/assets/* filter=lfs diff=lfs merge=lfs -text

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Bug report for the Element X Android app
2-
description: Report any issues that you have found with the Element X app. Please [check open issues](https://github.com/vector-im/element-x-android/issues) first, in case it has already been reported.
2+
description: Report any issues that you have found with the Element X app. Please [check open issues](https://github.com/element-hq/element-x-android/issues) first, in case it has already been reported.
33
labels: [T-Defect]
44
body:
55
- type: markdown

.github/ISSUE_TEMPLATE/enhancement.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ body:
55
- type: markdown
66
attributes:
77
value: |
8-
Thank you for taking the time to propose an enhancement to an existing feature. If you would like to propose a new feature or a major cross-platform change, please [start a discussion here](https://github.com/vector-im/element-meta/discussions/new?category=ideas).
8+
Thank you for taking the time to propose an enhancement to an existing feature. If you would like to propose a new feature or a major cross-platform change, please [start a discussion here](https://github.com/element-hq/element-meta/discussions/new?category=ideas).
99
- type: textarea
1010
id: usecase
1111
attributes:

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ updates:
1313
ignore:
1414
- dependency-name: "*"
1515
reviewers:
16-
- "vector-im/element-x-android-reviewers"
16+
- "element-hq/element-x-android-reviewers"
1717
# Updates for Gradle dependencies used in the app
1818
- package-ecosystem: "gradle"
1919
directory: "/"
@@ -23,4 +23,4 @@ updates:
2323
ignore:
2424
- dependency-name: "*"
2525
reviewers:
26-
- "vector-im/element-x-android-reviewers"
26+
- "element-hq/element-x-android-reviewers"

.github/pull_request_template.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Please read [CONTRIBUTING.md](https://github.com/vector-im/element-x-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
1+
<!-- Please read [CONTRIBUTING.md](https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
22

33
## Type of change
44

@@ -53,9 +53,9 @@ Uncomment this markdown table below and edit the last line `|||`:
5353

5454
- [ ] Changes have been tested on an Android device or Android emulator with API 23
5555
- [ ] UI change has been tested on both light and dark themes
56-
- [ ] Accessibility has been taken into account. See https://github.com/vector-im/element-x-android/blob/develop/CONTRIBUTING.md#accessibility
56+
- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility
5757
- [ ] Pull request is based on the develop branch
58-
- [ ] Pull request includes a new file under ./changelog.d. See https://github.com/vector-im/element-x-android/blob/develop/CONTRIBUTING.md#changelog
58+
- [ ] Pull request includes a new file under ./changelog.d. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#changelog
5959
- [ ] Pull request includes screenshots or videos if containing UI changes
6060
- [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)
6161
- [ ] You've made a self review of your PR

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ 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: Use JDK 17
36-
uses: actions/setup-java@v3
36+
uses: actions/setup-java@v4
3737
with:
3838
distribution: 'temurin' # See 'Supported distributions' for available options
3939
java-version: '17'
4040
- name: Configure gradle
41-
uses: gradle/gradle-build-action@v2.9.0
41+
uses: gradle/gradle-build-action@v2.11.1
4242
with:
4343
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
4444
- name: Assemble debug APK
@@ -50,7 +50,7 @@ jobs:
5050
run: ./gradlew :app:assembleDebug -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
5151
- name: Upload APK APKs
5252
if: ${{ matrix.variant == 'debug' }}
53-
uses: actions/upload-artifact@v3
53+
uses: actions/upload-artifact@v4
5454
with:
5555
name: elementx-debug
5656
path: |

.github/workflows/danger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- run: |
1212
npm install --save-dev @babel/plugin-transform-flow-strip-types
1313
- name: Danger
14-
uses: danger/[email protected].0
14+
uses: danger/[email protected].1
1515
with:
1616
args: "--dangerfile ./tools/danger/dangerfile.js"
1717
env:

.github/workflows/gradle-wrapper-update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Update Gradle Wrapper
1313
uses: gradle-update/update-gradle-wrapper-action@v1
1414
# Skip in forks
15-
if: github.repository == 'vector-im/element-x-android'
15+
if: github.repository == 'element-hq/element-x-android'
1616
with:
1717
repo-token: ${{ secrets.GITHUB_TOKEN }}
1818
target-branch: develop

.github/workflows/maestro.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
name: Maestro
22

3-
# Run this flow only on pull request, and only when the pull request has been approved, to limit our usage of maestro cloud.
4-
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#running-a-workflow-when-a-pull-request-is-approved
3+
# Run this flow only on pull request, and only when the pull request has the Run-Maestro label, to limit our usage of maestro cloud.
54
on:
65
workflow_dispatch:
7-
pull_request_review:
8-
types: [submitted]
6+
pull_request:
7+
types: [labeled]
98

109
# Enrich gradle.properties for CI/CD
1110
env:
@@ -16,20 +15,25 @@ jobs:
1615
maestro-cloud:
1716
name: Maestro test suite
1817
runs-on: ubuntu-latest
19-
if: github.event.review.state == 'approved' || github.event_name == 'workflow_dispatch'
18+
if: github.event_name == 'workflow_dispatch' || github.event.label.name == 'Run-Maestro'
2019
strategy:
2120
fail-fast: false
2221
# Allow one per PR.
2322
concurrency:
2423
group: ${{ format('maestro-{0}', github.ref) }}
2524
cancel-in-progress: true
2625
steps:
26+
- name: Remove Run-Maestro label
27+
if: ${{ github.event.label.name == 'Run-Maestro' }}
28+
uses: actions-ecosystem/action-remove-labels@v1
29+
with:
30+
labels: Run-Maestro
2731
- uses: actions/checkout@v4
2832
with:
2933
# Ensure we are building the branch and not the branch after being merged on develop
3034
# https://github.com/actions/checkout/issues/881
3135
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
32-
- uses: actions/setup-java@v3
36+
- uses: actions/setup-java@v4
3337
name: Use JDK 17
3438
with:
3539
distribution: 'temurin' # See 'Supported distributions' for available options

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
nightly:
1515
name: Build and publish nightly bundle to Firebase
1616
runs-on: ubuntu-latest
17-
if: ${{ github.repository == 'vector-im/element-x-android' }}
17+
if: ${{ github.repository == 'element-hq/element-x-android' }}
1818
steps:
1919
- uses: actions/checkout@v4
2020
- name: Use JDK 17
21-
uses: actions/setup-java@v3
21+
uses: actions/setup-java@v4
2222
with:
2323
distribution: 'temurin' # See 'Supported distributions' for available options
2424
java-version: '17'

0 commit comments

Comments
 (0)