Skip to content

Commit 5048d05

Browse files
jmartinespjmartinesp
committed
Merge branch 'release/25.08.4'
2 parents 4c67edf + 4271df9 commit 5048d05

File tree

1,801 files changed

+10840
-5598
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,801 files changed

+10840
-5598
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
# https://github.com/actions/checkout/issues/881
3232
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
3333
- name: Use JDK 21
34-
uses: actions/setup-java@v4
34+
uses: actions/setup-java@v5
3535
with:
3636
distribution: 'temurin' # See 'Supported distributions' for available options
3737
java-version: '21'

‎.github/workflows/build_enterprise.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Clone submodules
4040
run: git submodule update --init --recursive
4141
- name: Use JDK 21
42-
uses: actions/setup-java@v4
42+
uses: actions/setup-java@v5
4343
with:
4444
distribution: 'temurin' # See 'Supported distributions' for available options
4545
java-version: '21'

‎.github/workflows/generate_github_pages.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: ⏬ Checkout with LFS
1515
uses: nschloe/action-cached-lfs-checkout@f46300cd8952454b9f0a21a3d133d4bd5684cfc2 # v1.2.3
1616
- name: Use JDK 21
17-
uses: actions/setup-java@v4
17+
uses: actions/setup-java@v5
1818
with:
1919
distribution: 'temurin' # See 'Supported distributions' for available options
2020
java-version: '21'

‎.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
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
1313
steps:
1414
- uses: actions/checkout@v5
15-
- uses: actions/setup-java@v4
15+
- uses: actions/setup-java@v5
1616
name: Use JDK 21
1717
if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
1818
with:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
# Ensure we are building the branch and not the branch after being merged on develop
2929
# https://github.com/actions/checkout/issues/881
3030
ref: ${{ github.ref }}
31-
- uses: actions/setup-java@v4
31+
- uses: actions/setup-java@v5
3232
name: Use JDK 21
3333
with:
3434
distribution: 'temurin' # See 'Supported distributions' for available options

‎.github/workflows/nightly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v5
2020
- name: Use JDK 21
21-
uses: actions/setup-java@v4
21+
uses: actions/setup-java@v5
2222
with:
2323
distribution: 'temurin' # See 'Supported distributions' for available options
2424
java-version: '21'

‎.github/workflows/nightlyReports.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: nschloe/action-cached-lfs-checkout@f46300cd8952454b9f0a21a3d133d4bd5684cfc2 # v1.2.3
2222

2323
- name: Use JDK 21
24-
uses: actions/setup-java@v4
24+
uses: actions/setup-java@v5
2525
with:
2626
distribution: 'temurin' # See 'Supported distributions' for available options
2727
java-version: '21'
@@ -62,7 +62,7 @@ jobs:
6262
steps:
6363
- uses: actions/checkout@v5
6464
- name: Use JDK 21
65-
uses: actions/setup-java@v4
65+
uses: actions/setup-java@v5
6666
with:
6767
distribution: 'temurin' # See 'Supported distributions' for available options
6868
java-version: '21'

‎.github/workflows/quality.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
steps:
4848
- uses: actions/checkout@v5
4949
- name: Use JDK 21
50-
uses: actions/setup-java@v4
50+
uses: actions/setup-java@v5
5151
with:
5252
distribution: 'temurin' # See 'Supported distributions' for available options
5353
java-version: '21'
@@ -85,7 +85,7 @@ jobs:
8585
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
8686
run: git submodule update --init --recursive
8787
- name: Use JDK 21
88-
uses: actions/setup-java@v4
88+
uses: actions/setup-java@v5
8989
with:
9090
distribution: 'temurin' # See 'Supported distributions' for available options
9191
java-version: '21'
@@ -125,7 +125,7 @@ jobs:
125125
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
126126
run: git submodule update --init --recursive
127127
- name: Use JDK 21
128-
uses: actions/setup-java@v4
128+
uses: actions/setup-java@v5
129129
with:
130130
distribution: 'temurin' # See 'Supported distributions' for available options
131131
java-version: '21'
@@ -169,7 +169,7 @@ jobs:
169169
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
170170
run: git submodule update --init --recursive
171171
- name: Use JDK 21
172-
uses: actions/setup-java@v4
172+
uses: actions/setup-java@v5
173173
with:
174174
distribution: 'temurin' # See 'Supported distributions' for available options
175175
java-version: '21'
@@ -209,7 +209,7 @@ jobs:
209209
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
210210
run: git submodule update --init --recursive
211211
- name: Use JDK 21
212-
uses: actions/setup-java@v4
212+
uses: actions/setup-java@v5
213213
with:
214214
distribution: 'temurin' # See 'Supported distributions' for available options
215215
java-version: '21'
@@ -249,7 +249,7 @@ jobs:
249249
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
250250
run: git submodule update --init --recursive
251251
- name: Use JDK 21
252-
uses: actions/setup-java@v4
252+
uses: actions/setup-java@v5
253253
with:
254254
distribution: 'temurin' # See 'Supported distributions' for available options
255255
java-version: '21'

‎.github/workflows/recordScreenshots.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
with:
3535
persist-credentials: false
3636
- name: ☕️ Use JDK 21
37-
uses: actions/setup-java@v4
37+
uses: actions/setup-java@v5
3838
with:
3939
distribution: 'temurin' # See 'Supported distributions' for available options
4040
java-version: '21'

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v5
2222
- name: Use JDK 21
23-
uses: actions/setup-java@v4
23+
uses: actions/setup-java@v5
2424
with:
2525
distribution: 'temurin' # See 'Supported distributions' for available options
2626
java-version: '21'
@@ -61,7 +61,7 @@ jobs:
6161
- name: Clone submodules
6262
run: git submodule update --init --recursive
6363
- name: Use JDK 21
64-
uses: actions/setup-java@v4
64+
uses: actions/setup-java@v5
6565
with:
6666
distribution: 'temurin' # See 'Supported distributions' for available options
6767
java-version: '21'
@@ -89,7 +89,7 @@ jobs:
8989
steps:
9090
- uses: actions/checkout@v5
9191
- name: Use JDK 21
92-
uses: actions/setup-java@v4
92+
uses: actions/setup-java@v5
9393
with:
9494
distribution: 'temurin' # See 'Supported distributions' for available options
9595
java-version: '21'

0 commit comments

Comments
 (0)