Skip to content

Commit f8ec564

Browse files
committed
Merge branch 'main' into feat/logcat-sentry-logs
# Conflicts: # CHANGELOG.md
2 parents e566455 + b292090 commit f8ec564

File tree

55 files changed

+2845
-75
lines changed

Some content is hidden

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

55 files changed

+2845
-75
lines changed

.github/workflows/agp-matrix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
agp: [ '8.7.0','8.8.0','8.9.0-beta01' ]
20+
agp: [ '8.7.0','8.8.0','8.9.0' ]
2121
integrations: [ true, false ]
2222

2323
name: AGP Matrix Release - AGP ${{ matrix.agp }} - Integrations ${{ matrix.integrations }}
@@ -39,7 +39,7 @@ jobs:
3939
java-version: '17'
4040

4141
- name: Setup Gradle
42-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
42+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96
4343
with:
4444
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4545

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}
3838

3939
- name: Setup Gradle
40-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
40+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96
4141
with:
4242
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4343

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ jobs:
3131
java-version: '17'
3232

3333
- name: Setup Gradle
34-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
34+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96
3535
with:
3636
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3737

3838
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # pin@v2
39+
uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # pin@v2
4040
with:
4141
languages: 'java'
4242

@@ -45,4 +45,4 @@ jobs:
4545
./gradlew buildForCodeQL --no-build-cache
4646
4747
- name: Perform CodeQL Analysis
48-
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # pin@v2
48+
uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # pin@v2

.github/workflows/enforce-license-compliance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Setup Gradle
14-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
14+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96
1515

1616
- name: Set up Java
1717
uses: actions/setup-java@v4

.github/workflows/format-code.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,13 @@ jobs:
1818
distribution: 'temurin'
1919
java-version: '17'
2020

21-
- name: Cache Gradle packages
22-
uses: actions/cache@v4
21+
- name: Setup Gradle
22+
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
2323
with:
24-
path: |
25-
~/.gradle/caches
26-
~/.gradle/wrapper
27-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
28-
restore-keys: |
29-
${{ runner.os }}-gradle-
24+
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3025

31-
- name: Make format
32-
run: make format
26+
- name: Format with spotlessApply
27+
run: ./gradlew spotlessApply
3328

3429
# actions/checkout fetches only a single commit in a detached HEAD state. Therefore
3530
# we need to pass the current branch, otherwise we can't commit the changes.

.github/workflows/generate-javadocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
java-version: '17'
2121

2222
- name: Setup Gradle
23-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
23+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96
2424

2525
- name: Generate Aggregate Javadocs
2626
run: |

.github/workflows/integration-tests-benchmarks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
java-version: '17'
3939

4040
- name: Setup Gradle
41-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
41+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96
4242
with:
4343
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4444

@@ -88,7 +88,7 @@ jobs:
8888
java-version: '17'
8989

9090
- name: Setup Gradle
91-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
91+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96
9292
with:
9393
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
9494

.github/workflows/integration-tests-ui-critical.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
java-version: '17'
3737

3838
- name: Setup Gradle
39-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
39+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96
4040
with:
4141
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4242

.github/workflows/integration-tests-ui.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
java-version: '17'
3434

3535
- name: Setup Gradle
36-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
36+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96
3737
with:
3838
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3939

.github/workflows/release-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
java-version: '17'
2727

2828
- name: Setup Gradle
29-
uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
29+
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96
3030

3131
- name: Build artifacts
3232
run: make publish

0 commit comments

Comments
 (0)