Skip to content

Commit a2ad98c

Browse files
bmartybmarty
committed
Merge branch 'release/25.10.0' into main
2 parents ca686c9 + a4c0a6d commit a2ad98c

File tree

1,593 files changed

+20682
-4572
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,593 files changed

+20682
-4572
lines changed

‎.editorconfig‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -913,3 +913,8 @@ ij_yaml_sequence_on_new_line = false
913913
ij_yaml_space_before_colon = false
914914
ij_yaml_spaces_within_braces = true
915915
ij_yaml_spaces_within_brackets = true
916+
917+
[**/generated/**]
918+
generated_code = true
919+
ij_formatter_enabled = false
920+
ktlint = disabled

‎.gitattributes‎

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

‎.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: '21'
3838
- name: Configure gradle
39-
uses: gradle/actions/setup-gradle@v4
39+
uses: gradle/actions/setup-gradle@v5
4040
with:
4141
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
4242
- name: Assemble debug APKs

‎.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: '21'
4646
- name: Configure gradle
47-
uses: gradle/actions/setup-gradle@v4
47+
uses: gradle/actions/setup-gradle@v5
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: '21'
2121
- name: Configure gradle
22-
uses: gradle/actions/setup-gradle@v4
22+
uses: gradle/actions/setup-gradle@v5
2323
with:
2424
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
2525
- name: Set up Python 3.12

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
distribution: 'temurin' # See 'Supported distributions' for available options
3535
java-version: '21'
3636
- name: Configure gradle
37-
uses: gradle/actions/setup-gradle@v4
37+
uses: gradle/actions/setup-gradle@v5
3838
with:
3939
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
4040
- 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: '21'
2828

2929
- name: Configure gradle
30-
uses: gradle/actions/setup-gradle@v4
30+
uses: gradle/actions/setup-gradle@v5
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: '21'
6969
- name: Configure gradle
70-
uses: gradle/actions/setup-gradle@v4
70+
uses: gradle/actions/setup-gradle@v5
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: '21'
5454
- name: Configure gradle
55-
uses: gradle/actions/setup-gradle@v4
55+
uses: gradle/actions/setup-gradle@v5
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: '21'
9292
- name: Configure gradle
93-
uses: gradle/actions/setup-gradle@v4
93+
uses: gradle/actions/setup-gradle@v5
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: '21'
132132
- name: Configure gradle
133-
uses: gradle/actions/setup-gradle@v4
133+
uses: gradle/actions/setup-gradle@v5
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: '21'
176176
- name: Configure gradle
177-
uses: gradle/actions/setup-gradle@v4
177+
uses: gradle/actions/setup-gradle@v5
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: '21'
216216
- name: Configure gradle
217-
uses: gradle/actions/setup-gradle@v4
217+
uses: gradle/actions/setup-gradle@v5
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: '21'
256256
- name: Configure gradle
257-
uses: gradle/actions/setup-gradle@v4
257+
uses: gradle/actions/setup-gradle@v5
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
@@ -40,7 +40,7 @@ jobs:
4040
java-version: '21'
4141
# Add gradle cache, this should speed up the process
4242
- name: Configure gradle
43-
uses: gradle/actions/setup-gradle@v4
43+
uses: gradle/actions/setup-gradle@v5
4444
with:
4545
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
4646
- name: Record screenshots

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
distribution: 'temurin' # See 'Supported distributions' for available options
2626
java-version: '21'
2727
- name: Configure gradle
28-
uses: gradle/actions/setup-gradle@v4
28+
uses: gradle/actions/setup-gradle@v5
2929
- name: Create app bundle
3030
env:
3131
ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}
@@ -66,7 +66,7 @@ jobs:
6666
distribution: 'temurin' # See 'Supported distributions' for available options
6767
java-version: '21'
6868
- name: Configure gradle
69-
uses: gradle/actions/setup-gradle@v4
69+
uses: gradle/actions/setup-gradle@v5
7070
- name: Create Enterprise app bundle
7171
env:
7272
ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}
@@ -94,7 +94,7 @@ jobs:
9494
distribution: 'temurin' # See 'Supported distributions' for available options
9595
java-version: '21'
9696
- name: Configure gradle
97-
uses: gradle/actions/setup-gradle@v4
97+
uses: gradle/actions/setup-gradle@v5
9898
- name: Create APKs
9999
env:
100100
ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}

0 commit comments

Comments
 (0)