Skip to content

Commit a33ae00

Browse files
committed
Merge branch 'main' into feat/user-feedback-widget
# Conflicts: # sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java # sentry/api/sentry.api # sentry/src/main/java/io/sentry/HubAdapter.java # sentry/src/main/java/io/sentry/HubScopesWrapper.java # sentry/src/main/java/io/sentry/IScopes.java # sentry/src/main/java/io/sentry/NoOpHub.java # sentry/src/main/java/io/sentry/NoOpScopes.java # sentry/src/main/java/io/sentry/Scopes.java # sentry/src/main/java/io/sentry/ScopesAdapter.java # sentry/src/main/java/io/sentry/SentryClient.java # sentry/src/main/java/io/sentry/transport/RateLimiter.java
2 parents 6eb876c + 93c1e3f commit a33ae00

File tree

107 files changed

+2345
-358
lines changed

Some content is hidden

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

107 files changed

+2345
-358
lines changed

.github/workflows/agp-matrix.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@ jobs:
3939
java-version: '17'
4040

4141
- name: Setup Gradle
42-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
42+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
4343
with:
44-
gradle-home-cache-cleanup: true
4544
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4645

4746
- name: Setup KVM

.github/workflows/build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ 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@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
40+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
4141
with:
42-
gradle-home-cache-cleanup: true
4342
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4443

4544
- name: Run Tests with coverage and Lint

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: 'CodeQL'
33
on:
44
push:
55
branches: [main]
6-
pull_request:
7-
# The branches below must be a subset of the branches above
8-
branches: [main]
96
schedule:
107
- cron: '17 23 * * 3'
118

@@ -34,9 +31,8 @@ jobs:
3431
java-version: '17'
3532

3633
- name: Setup Gradle
37-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
34+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
3835
with:
39-
gradle-home-cache-cleanup: true
4036
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4137

4238
- name: Initialize CodeQL
@@ -46,7 +42,7 @@ jobs:
4642

4743
- name: Build Java
4844
run: |
49-
./gradlew buildForCodeQL
45+
./gradlew buildForCodeQL --no-build-cache
5046
5147
- name: Perform CodeQL Analysis
5248
uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # pin@v2

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Setup Gradle
14-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
15-
with:
16-
gradle-home-cache-cleanup: true
14+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
1715

1816
- name: Set up Java
1917
uses: actions/setup-java@v4

.github/workflows/generate-javadocs.yml

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

2222
- name: Setup Gradle
23-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
24-
with:
25-
gradle-home-cache-cleanup: true
23+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
2624

2725
- name: Generate Aggregate Javadocs
2826
run: |

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

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

4040
- name: Setup Gradle
41-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
41+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
4242
with:
43-
gradle-home-cache-cleanup: true
4443
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4544

4645
# Clean, build and release a test apk, but only if we will run the benchmark
@@ -89,9 +88,8 @@ jobs:
8988
java-version: '17'
9089

9190
- name: Setup Gradle
92-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
91+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
9392
with:
94-
gradle-home-cache-cleanup: true
9593
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
9694

9795
- uses: actions/cache@v4

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ jobs:
3636
java-version: '17'
3737

3838
- name: Setup Gradle
39-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
39+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
4040
with:
41-
gradle-home-cache-cleanup: true
4241
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4342

4443
- name: Build debug APK

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ jobs:
3333
java-version: '17'
3434

3535
- name: Setup Gradle
36-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
36+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
3737
with:
38-
gradle-home-cache-cleanup: true
3938
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4039

4140
# Clean, build and release a test apk, but only if we will run the benchmark

.github/workflows/release-build.yml

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

2828
- name: Setup Gradle
29-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
30-
with:
31-
gradle-home-cache-cleanup: true
29+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
3230

3331
- name: Build artifacts
3432
run: make publish

.github/workflows/system-tests-backend.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ jobs:
5757
java-version: '17'
5858

5959
- name: Setup Gradle
60-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # pin@v3
60+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
6161
with:
62-
gradle-home-cache-cleanup: true
6362
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
6463

6564
- name: Exclude android modules from build

0 commit comments

Comments
 (0)