Skip to content

Commit 19a9616

Browse files
ganfraganfra
committed
Merge branch 'release/0.5.1' into main
2 parents 5a2d19f + e227581 commit 19a9616

File tree

668 files changed

+12184
-2190
lines changed

Some content is hidden

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

668 files changed

+12184
-2190
lines changed

‎.github/renovate.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"PR-Dependencies"
88
],
99
"ignoreDeps" : [
10-
"string:app_name"
10+
"string:app_name",
11+
"gradle"
1112
],
1213
"packageRules" : [
1314
{

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
distribution: 'temurin' # See 'Supported distributions' for available options
3737
java-version: '17'
3838
- name: Configure gradle
39-
uses: gradle/actions/setup-gradle@v3
39+
uses: gradle/actions/setup-gradle@v4
4040
with:
4141
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
4242
- name: Assemble debug Gplay APK

‎.github/workflows/build_enterprise.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
distribution: 'temurin' # See 'Supported distributions' for available options
4545
java-version: '17'
4646
- name: Configure gradle
47-
uses: gradle/actions/setup-gradle@v3
47+
uses: gradle/actions/setup-gradle@v4
4848
with:
4949
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
5050
- name: Assemble debug Gplay Enterprise APK

‎.github/workflows/generate_github_pages.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
distribution: 'temurin' # See 'Supported distributions' for available options
2020
java-version: '17'
2121
- name: Configure gradle
22-
uses: gradle/actions/setup-gradle@v3
22+
uses: gradle/actions/setup-gradle@v4
2323
with:
2424
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
2525
- name: Set up Python 3.12

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
11
name: Update Gradle Wrapper
22

33
on:
4+
workflow_dispatch:
45
schedule:
56
- cron: "0 0 * * *"
67

78
jobs:
89
update-gradle-wrapper:
910
runs-on: ubuntu-latest
11+
# Skip in forks
12+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
1013
steps:
1114
- uses: actions/checkout@v4
15+
- uses: actions/setup-java@v4
16+
name: Use JDK 17
17+
if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
18+
with:
19+
distribution: 'temurin' # See 'Supported distributions' for available options
20+
java-version: '17'
1221
- name: Update Gradle Wrapper
1322
uses: gradle-update/update-gradle-wrapper-action@v1
14-
# Skip in forks
15-
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
1623
with:
17-
repo-token: ${{ secrets.GITHUB_TOKEN }}
24+
repo-token: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
1825
target-branch: develop
26+
labels: PR-Build

‎.github/workflows/gradle-wrapper-validation.yml‎

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

‎.github/workflows/maestro.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
distribution: 'temurin' # See 'Supported distributions' for available options
4040
java-version: '17'
4141
- name: Configure gradle
42-
uses: gradle/actions/setup-gradle@v3
42+
uses: gradle/actions/setup-gradle@v4
4343
with:
4444
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
4545
- name: Assemble debug APK

‎.github/workflows/nightlyReports.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
java-version: '17'
2828

2929
- name: Configure gradle
30-
uses: gradle/actions/setup-gradle@v3
30+
uses: gradle/actions/setup-gradle@v4
3131
with:
3232
cache-read-only: false
3333

@@ -67,7 +67,7 @@ jobs:
6767
distribution: 'temurin' # See 'Supported distributions' for available options
6868
java-version: '17'
6969
- name: Configure gradle
70-
uses: gradle/actions/setup-gradle@v3
70+
uses: gradle/actions/setup-gradle@v4
7171
with:
7272
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
7373
- name: Dependency analysis

‎.github/workflows/quality.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
distribution: 'temurin' # See 'Supported distributions' for available options
5353
java-version: '17'
5454
- name: Configure gradle
55-
uses: gradle/actions/setup-gradle@v3
55+
uses: gradle/actions/setup-gradle@v4
5656
with:
5757
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
5858
- name: Set up Python 3.12
@@ -90,7 +90,7 @@ jobs:
9090
distribution: 'temurin' # See 'Supported distributions' for available options
9191
java-version: '17'
9292
- name: Configure gradle
93-
uses: gradle/actions/setup-gradle@v3
93+
uses: gradle/actions/setup-gradle@v4
9494
with:
9595
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
9696
- name: Run Konsist tests
@@ -130,7 +130,7 @@ jobs:
130130
distribution: 'temurin' # See 'Supported distributions' for available options
131131
java-version: '17'
132132
- name: Configure gradle
133-
uses: gradle/actions/setup-gradle@v3
133+
uses: gradle/actions/setup-gradle@v4
134134
with:
135135
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
136136
- name: Build Gplay Debug
@@ -174,7 +174,7 @@ jobs:
174174
distribution: 'temurin' # See 'Supported distributions' for available options
175175
java-version: '17'
176176
- name: Configure gradle
177-
uses: gradle/actions/setup-gradle@v3
177+
uses: gradle/actions/setup-gradle@v4
178178
with:
179179
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
180180
- name: Run Detekt
@@ -214,7 +214,7 @@ jobs:
214214
distribution: 'temurin' # See 'Supported distributions' for available options
215215
java-version: '17'
216216
- name: Configure gradle
217-
uses: gradle/actions/setup-gradle@v3
217+
uses: gradle/actions/setup-gradle@v4
218218
with:
219219
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
220220
- name: Run Ktlint check
@@ -254,7 +254,7 @@ jobs:
254254
distribution: 'temurin' # See 'Supported distributions' for available options
255255
java-version: '17'
256256
- name: Configure gradle
257-
uses: gradle/actions/setup-gradle@v3
257+
uses: gradle/actions/setup-gradle@v4
258258
with:
259259
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
260260
- name: Run Knit

‎.github/workflows/recordScreenshots.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
java-version: '17'
4040
# Add gradle cache, this should speed up the process
4141
- name: Configure gradle
42-
uses: gradle/actions/setup-gradle@v3
42+
uses: gradle/actions/setup-gradle@v4
4343
with:
4444
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
4545
- name: Record screenshots

0 commit comments

Comments
 (0)