Skip to content

Commit fca16b6

Browse files
ganfraganfra
committed
Merge branch 'release/1.6.20' into main
2 parents 0263183 + d0d05d5 commit fca16b6

File tree

758 files changed

+5457
-4492
lines changed

Some content is hidden

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

758 files changed

+5457
-4492
lines changed

‎.github/workflows/build.yml

+14-4
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,17 @@ jobs:
2424
group: ${{ github.ref == 'refs/heads/develop' && format('integration-tests-develop-{0}-{1}', matrix.target, github.sha) || format('build-debug-{0}-{1}', matrix.target, github.ref) }}
2525
cancel-in-progress: true
2626
steps:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828
with:
2929
# https://github.com/actions/checkout/issues/881
3030
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
31+
- name: Use JDK 17
32+
uses: actions/setup-java@v4
33+
with:
34+
distribution: 'temurin' # See 'Supported distributions' for available options
35+
java-version: '17'
3136
- name: Configure gradle
32-
uses: gradle/gradle-build-action@v2
37+
uses: gradle/actions/setup-gradle@v3
3338
with:
3439
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
3540
- name: Assemble ${{ matrix.target }} debug apk
@@ -48,12 +53,17 @@ jobs:
4853
group: ${{ github.ref == 'refs/head/main' && format('build-release-apk-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('build-release-apk-develop-{0}', github.sha) || format('build-debug-{0}', github.ref) }}
4954
cancel-in-progress: ${{ github.ref != 'refs/head/main' }}
5055
steps:
51-
- uses: actions/checkout@v3
56+
- uses: actions/checkout@v4
5257
with:
5358
# https://github.com/actions/checkout/issues/881
5459
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
60+
- name: Use JDK 17
61+
uses: actions/setup-java@v4
62+
with:
63+
distribution: 'temurin' # See 'Supported distributions' for available options
64+
java-version: '17'
5565
- name: Configure gradle
56-
uses: gradle/gradle-build-action@v2
66+
uses: gradle/actions/setup-gradle@v3
5767
with:
5868
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
5969
- name: Assemble GPlay unsigned apk

‎.github/workflows/danger.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
name: Danger
99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1111
- run: |
1212
npm install --save-dev @babel/plugin-transform-flow-strip-types
1313
- name: Danger

‎.github/workflows/docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout repository
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414

1515
- name: Build docs
1616
run: ./gradlew dokkaHtml

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ jobs:
1010
runs-on: ubuntu-latest
1111
# No concurrency required, this is a prerequisite to other actions and should run every time.
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- uses: gradle/wrapper-validation-action@v1

‎.github/workflows/nightly.yml

+8-3
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,26 @@ on:
77
- cron: "0 4 * * *"
88

99
env:
10-
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=1g" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
10+
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx6g -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=1g" -Dkotlin.incremental=false -XX:+UseG1GC
1111
CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
1212

1313
jobs:
1414
nightly:
1515
name: Build and publish nightly Gplay APK to Firebase
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: Set up Python 3.8
2020
uses: actions/setup-python@v4
2121
with:
2222
python-version: 3.8
23+
- name: Use JDK 17
24+
uses: actions/setup-java@v4
25+
with:
26+
distribution: 'temurin' # See 'Supported distributions' for available options
27+
java-version: '17'
2328
- name: Configure gradle
24-
uses: gradle/gradle-build-action@v2
29+
uses: gradle/actions/setup-gradle@v3
2530
with:
2631
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
2732
- name: Install towncrier

‎.github/workflows/post-pr.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,18 @@ jobs:
3939
api-level: [ 28 ]
4040
# No concurrency required, runs every time on a schedule.
4141
steps:
42-
- uses: actions/checkout@v3
42+
- uses: actions/checkout@v4
4343
- name: Set up Python 3.8
4444
uses: actions/setup-python@v4
4545
with:
4646
python-version: 3.8
47-
- uses: actions/setup-java@v3
47+
- name: Use JDK 17
48+
uses: actions/setup-java@v4
4849
with:
49-
distribution: 'adopt'
50-
java-version: '11'
50+
distribution: 'temurin' # See 'Supported distributions' for available options
51+
java-version: '17'
5152
- name: Configure gradle
52-
uses: gradle/gradle-build-action@v2
53+
uses: gradle/actions/setup-gradle@v3
5354
with:
5455
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
5556
- name: Start synapse server

‎.github/workflows/quality.yml

+32-5
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ on:
77

88
# Enrich gradle.properties for CI/CD
99
env:
10-
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -XX:MaxPermSize=512m -Dkotlin.daemon.jvm.options="-Xmx2g" -Dkotlin.incremental=false
10+
GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=1g" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
1111
CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
1212

1313
jobs:
1414
check:
1515
name: Project Check Suite
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: Run code quality check suite
2020
run: ./tools/check/check_code_quality.sh
2121

@@ -24,7 +24,16 @@ jobs:
2424
name: Knit
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
28+
- name: Use JDK 17
29+
uses: actions/setup-java@v4
30+
with:
31+
distribution: 'temurin' # See 'Supported distributions' for available options
32+
java-version: '17'
33+
- name: Configure gradle
34+
uses: gradle/actions/setup-gradle@v3
35+
with:
36+
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
2837
- name: Run knit
2938
run: |
3039
./gradlew knitCheck $CI_GRADLE_ARG_PROPERTIES
@@ -38,7 +47,16 @@ jobs:
3847
group: ${{ github.ref == 'refs/heads/main' && format('lint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('lint-develop-{0}', github.sha) || format('lint-{0}', github.ref) }}
3948
cancel-in-progress: true
4049
steps:
41-
- uses: actions/checkout@v3
50+
- uses: actions/checkout@v4
51+
- name: Use JDK 17
52+
uses: actions/setup-java@v4
53+
with:
54+
distribution: 'temurin' # See 'Supported distributions' for available options
55+
java-version: '17'
56+
- name: Configure gradle
57+
uses: gradle/actions/setup-gradle@v3
58+
with:
59+
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
4260
- name: Run ktlint
4361
run: |
4462
./gradlew ktlintCheck $CI_GRADLE_ARG_PROPERTIES --continue
@@ -83,7 +101,16 @@ jobs:
83101
group: ${{ github.ref == 'refs/heads/main' && format('dep-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('dep-develop-{0}', github.sha) || format('dep-{0}', github.ref) }}
84102
cancel-in-progress: true
85103
steps:
86-
- uses: actions/checkout@v3
104+
- uses: actions/checkout@v4
105+
- name: Use JDK 17
106+
uses: actions/setup-java@v4
107+
with:
108+
distribution: 'temurin' # See 'Supported distributions' for available options
109+
java-version: '17'
110+
- name: Configure gradle
111+
uses: gradle/actions/setup-gradle@v3
112+
with:
113+
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
87114
- name: Dependency analysis
88115
run: ./gradlew dependencyCheckAnalyze $CI_GRADLE_ARG_PROPERTIES
89116
- name: Upload dependency analysis

‎.github/workflows/sync-from-external-sources.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
if: github.repository == 'element-hq/element-android'
1313
# No concurrency required, runs every time on a schedule.
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- name: Set up Python 3.8
1717
uses: actions/setup-python@v4
1818
with:
@@ -39,7 +39,7 @@ jobs:
3939
if: github.repository == 'element-hq/element-android'
4040
# No concurrency required, runs every time on a schedule.
4141
steps:
42-
- uses: actions/checkout@v3
42+
- uses: actions/checkout@v4
4343
- name: Set up Python 3.8
4444
uses: actions/setup-python@v4
4545
with:

‎.github/workflows/tests.yml

+12-9
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,17 @@ jobs:
2525
group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-{0}', github.sha) || format('unit-tests-{0}', github.ref) }}
2626
cancel-in-progress: true
2727
steps:
28-
- uses: actions/checkout@v3
28+
- uses: actions/checkout@v4
2929
with:
3030
lfs: true
3131
fetch-depth: 0
32-
- uses: actions/setup-java@v3
32+
- name: Use JDK 17
33+
uses: actions/setup-java@v4
3334
with:
34-
distribution: 'adopt'
35+
distribution: 'temurin' # See 'Supported distributions' for available options
3536
java-version: '17'
36-
- uses: gradle/gradle-build-action@v2
37+
- name: Configure gradle
38+
uses: gradle/actions/setup-gradle@v3
3739
with:
3840
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
3941
gradle-home-cache-cleanup: ${{ github.ref == 'refs/heads/develop' }}
@@ -136,13 +138,14 @@ jobs:
136138
# group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-{0}', github.sha) || format('build-android-tests-{0}', github.ref) }}
137139
# cancel-in-progress: true
138140
# steps:
139-
# - uses: actions/checkout@v3
140-
# - uses: actions/setup-java@v3
141+
# - uses: actions/checkout@v4
142+
# - name: Use JDK 17
143+
# uses: actions/setup-java@v4
141144
# with:
142-
# distribution: 'adopt'
143-
# java-version: 11
145+
# distribution: 'temurin' # See 'Supported distributions' for available options
146+
# java-version: '17'
144147
# - name: Configure gradle
145-
# uses: gradle/gradle-build-action@v2
148+
# uses: gradle/actions/setup-gradle@v3
146149
# with:
147150
# cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
148151
# - name: Build Android Tests

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313

1414
- name: Update Gradle Wrapper
1515
uses: gradle-update/update-gradle-wrapper-action@v1

‎.github/workflows/validate-lfs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
name: Validate
99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1111
with:
1212
lfs: 'true'
1313

‎CHANGES.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
Changes in Element v1.6.20 (2024-07-25)
2+
=======================================
3+
4+
Other changes
5+
-------------
6+
- Bump compile and target SDK to 34 ([#8860](https://github.com/element-hq/element-android/pull/8860)
7+
- Supports Authenticated media apis ([#8868](https://github.com/element-hq/element-android/pull/8868)
8+
19
Changes in Element v1.6.18 (2024-06-25)
210
=======================================
311

0 commit comments

Comments
 (0)