Skip to content

Commit 6d4b6f8

Browse files
Merge main into no/java-829-replay-anchored-clock [pr-shepherd]
Resolve CHANGELOG.md conflict by keeping both Unreleased Fixes entries (#6542 and #6599).
2 parents eb8b9cd + 23b4b90 commit 6d4b6f8

159 files changed

Lines changed: 315 additions & 106 deletions

File tree

Some content is hidden

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

‎.claude/skills/btrace-perfetto/SKILL.md‎

Lines changed: 8 additions & 8 deletions

‎.github/workflows/integration-tests-macrobenchmark.yml‎

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

3434
- name: Assemble target app and Macrobenchmark apk
3535
if: env.SAUCE_USERNAME != null
36-
run: ./gradlew -p sentry-samples/sentry-samples-android :assembleRelease :macrobenchmark:assembleBenchmark
36+
run: ./gradlew -p sentry-android-integration-tests :sentry-samples-android:assembleRelease :sentry-uitest-android-macrobenchmark:assembleBenchmark
3737

3838
- name: Run Macrobenchmark in SauceLab
3939
uses: saucelabs/saucectl-run-action@283660aa934c02723c497efa151d582a3acc5801 # pin@v3

‎.github/workflows/samples.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
include:
23-
- name: sentry-samples-android
24-
path: sentry-samples/sentry-samples-android
2523
- name: sentry-android-integration-tests
2624
path: sentry-android-integration-tests
2725
- name: sentry-samples

‎.github/workflows/spring-boot-2-matrix.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88
paths-ignore:
99
- '*android*/**'
1010
- 'sentry-compose/**'
11-
- 'sentry-samples/sentry-samples-android/**'
1211

1312
concurrency:
1413
group: ${{ github.workflow }}-${{ github.ref }}

‎.github/workflows/spring-boot-3-matrix.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88
paths-ignore:
99
- '*android*/**'
1010
- 'sentry-compose/**'
11-
- 'sentry-samples/sentry-samples-android/**'
1211

1312
concurrency:
1413
group: ${{ github.workflow }}-${{ github.ref }}

‎.github/workflows/spring-boot-4-matrix.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88
paths-ignore:
99
- '*android*/**'
1010
- 'sentry-compose/**'
11-
- 'sentry-samples/sentry-samples-android/**'
1211

1312
concurrency:
1413
group: ${{ github.workflow }}-${{ github.ref }}

‎.sauce/sentry-uitest-android-macrobenchmark.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ defaults:
1414
timeout: 40m
1515

1616
espresso:
17-
app: ./sentry-samples/sentry-samples-android/build/outputs/apk/release/sentry-samples-android-release.apk
18-
testApp: ./sentry-samples/sentry-samples-android/macrobenchmark/build/outputs/apk/benchmark/macrobenchmark-benchmark.apk
17+
app: ./sentry-android-integration-tests/sentry-samples-android/build/outputs/apk/release/sentry-samples-android-release.apk
18+
testApp: ./sentry-android-integration-tests/sentry-uitest-android-macrobenchmark/build/outputs/apk/benchmark/sentry-uitest-android-macrobenchmark-benchmark.apk
1919

2020
suites:
2121

‎AGENTS.md‎

Lines changed: 3 additions & 3 deletions

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions

‎Makefile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,12 @@ update:
2929
format:
3030
./gradlew spotlessApply
3131
./gradlew -p sentry-samples spotlessApply
32-
./gradlew -p sentry-samples/sentry-samples-android spotlessApply
3332
./gradlew -p sentry-android-integration-tests spotlessApply
3433

3534
# Spotless check's code
3635
checkFormat:
3736
./gradlew spotlessJavaCheck spotlessKotlinCheck
3837
./gradlew -p sentry-samples spotlessJavaCheck spotlessKotlinCheck
39-
./gradlew -p sentry-samples/sentry-samples-android spotlessJavaCheck spotlessKotlinCheck
4038
./gradlew -p sentry-android-integration-tests spotlessJavaCheck spotlessKotlinCheck
4139

4240
# Binary compatibility validator

0 commit comments

Comments
 (0)