Skip to content

Commit 509f992

Browse files
committed
Merge branch 'refs/heads/main' into feat/new-user-feedback-logic
# Conflicts: # CHANGELOG.md # sentry/api/sentry.api # sentry/src/main/java/io/sentry/SentryClient.java
2 parents 144bcca + 084562d commit 509f992

File tree

294 files changed

+8364
-1735
lines changed

Some content is hidden

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

294 files changed

+8364
-1735
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@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
42+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
4343
with:
4444
gradle-home-cache-cleanup: true
4545
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
@@ -61,7 +61,7 @@ jobs:
6161

6262
# We tried to use the cache action to cache gradle stuff, but it made tests slower and timeout
6363
- name: Run instrumentation tests
64-
uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d # pin@v2
64+
uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed # pin@v2
6565
with:
6666
api-level: 30
6767
force-avd-creation: false

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
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@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
40+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
4141
with:
4242
gradle-home-cache-cleanup: true
4343
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
@@ -46,7 +46,7 @@ jobs:
4646
run: make preMerge
4747

4848
- name: Upload coverage to Codecov
49-
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # pin@v4
49+
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # pin@v4
5050
with:
5151
name: sentry-java
5252
fail_ci_if_error: false

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ jobs:
3434
java-version: '17'
3535

3636
- name: Setup Gradle
37-
uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
37+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
3838
with:
3939
gradle-home-cache-cleanup: true
4040
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4141

4242
- name: Initialize CodeQL
43-
uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # pin@v2
43+
uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # pin@v2
4444
with:
4545
languages: 'java'
4646

@@ -49,4 +49,4 @@ jobs:
4949
./gradlew buildForCodeQL
5050
5151
- name: Perform CodeQL Analysis
52-
uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # pin@v2
52+
uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # 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@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
14+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
1515
with:
1616
gradle-home-cache-cleanup: true
1717

.github/workflows/generate-javadocs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ jobs:
2020
java-version: '17'
2121

2222
- name: Setup Gradle
23-
uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
23+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
2424
with:
2525
gradle-home-cache-cleanup: true
2626

2727
- name: Generate Aggregate Javadocs
2828
run: |
2929
./gradlew aggregateJavadocs
3030
- name: Deploy
31-
uses: JamesIves/github-pages-deploy-action@15de0f09300eea763baee31dff6c6184995c5f6a # pin@4.7.2
31+
uses: JamesIves/github-pages-deploy-action@6c2d9db40f9296374acc17b90404b6e8864128c8 # pin@4.7.3
3232
with:
3333
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3434
BRANCH: gh-pages

.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@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
41+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
4242
with:
4343
gradle-home-cache-cleanup: true
4444
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
@@ -89,7 +89,7 @@ jobs:
8989
java-version: '17'
9090

9191
- name: Setup Gradle
92-
uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
92+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
9393
with:
9494
gradle-home-cache-cleanup: true
9595
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}

.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@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
39+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
4040
with:
4141
gradle-home-cache-cleanup: true
4242
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
@@ -102,7 +102,7 @@ jobs:
102102
version: ${{env.MAESTRO_VERSION}}
103103

104104
- name: Run tests
105-
uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d # pin@v2.33.0
105+
uses: reactivecircus/android-emulator-runner@1dcd0090116d15e7c562f8db72807de5e036a4ed # pin@v2.34.0
106106
with:
107107
api-level: ${{ matrix.api-level }}
108108
force-avd-creation: false

.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@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
36+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
3737
with:
3838
gradle-home-cache-cleanup: true
3939
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}

.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@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
29+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
3030
with:
3131
gradle-home-cache-cleanup: true
3232

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- name: Get auth token
2121
id: token
22-
uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
22+
uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
2323
with:
2424
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2525
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

0 commit comments

Comments
 (0)