Skip to content

Commit c199dee

Browse files
authored
Merge branch 'main' into feat/profiling-cursor-rules
2 parents 1e28f07 + 8687935 commit c199dee

File tree

65 files changed

+1574
-860
lines changed

Some content is hidden

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

65 files changed

+1574
-860
lines changed

.github/workflows/agp-matrix.yml

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

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

@@ -50,7 +50,7 @@ jobs:
5050
sudo udevadm trigger --name-match=kvm
5151
5252
- name: AVD cache
53-
uses: actions/cache@v4
53+
uses: actions/cache@v5
5454
id: avd-cache
5555
with:
5656
path: |

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ jobs:
3131

3232
# Workaround for https://github.com/gradle/actions/issues/21 to use config cache
3333
- name: Cache buildSrc
34-
uses: actions/cache@v4
34+
uses: actions/cache@v5
3535
with:
3636
path: buildSrc/build
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@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2
40+
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884
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@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2
34+
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884
3535
with:
3636
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3737

3838
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # pin@v2
39+
uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # 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@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # pin@v2
48+
uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # 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@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2
14+
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884
1515

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

.github/workflows/format-code.yml

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

2121
- name: Setup Gradle
22-
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2
22+
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884
2323
with:
2424
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
2525

.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@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2
23+
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884
2424

2525
- name: Generate Aggregate Javadocs
2626
run: |

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

Lines changed: 3 additions & 3 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@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2
41+
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884
4242
with:
4343
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4444

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

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

95-
- uses: actions/cache@v4
95+
- uses: actions/cache@v5
9696
id: app-plain-cache
9797
with:
9898
path: sentry-android-integration-tests/test-app-plain/build/outputs/apk/release/test-app-plain-release.apk

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ jobs:
3030

3131
# Workaround for https://github.com/gradle/actions/issues/21 to use config cache
3232
- name: Cache buildSrc
33-
uses: actions/cache@v4
33+
uses: actions/cache@v5
3434
with:
3535
path: buildSrc/build
3636
key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}
3737

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

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

Lines changed: 2 additions & 2 deletions
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@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2
39+
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884
4040
with:
4141
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4242

@@ -90,7 +90,7 @@ jobs:
9090
sudo udevadm trigger --name-match=kvm
9191
9292
- name: AVD cache
93-
uses: actions/cache@v4
93+
uses: actions/cache@v5
9494
id: avd-cache
9595
with:
9696
path: |

.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@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2
36+
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884
3737
with:
3838
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3939

0 commit comments

Comments
 (0)