Skip to content

Commit 2ee6e8c

Browse files
committed
Merge branch 'main' into feat/queryable-frames-delay-api
2 parents 99acb6a + cd0981b commit 2ee6e8c

12 files changed

Lines changed: 77 additions & 20 deletions

File tree

.claude/skills/.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Ignore dotagents-managed skills (synced from agents.toml)
2+
*
3+
# Keep custom repo-specific skills
4+
!.gitignore
5+
!create-java-pr/
6+
!create-java-pr/**
7+
!test/
8+
!test/**

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
run: make preMerge
4646

4747
- name: Upload coverage to Codecov
48-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # pin@v4
48+
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # pin@v4
4949
with:
5050
name: sentry-java
5151
fail_ci_if_error: false

.github/workflows/changelog-preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ permissions:
1515

1616
jobs:
1717
changelog-preview:
18-
uses: getsentry/craft/.github/workflows/changelog-preview.yml@f4889d04564e47311038ecb6b910fef6b6cf1363 # v2
18+
uses: getsentry/craft/.github/workflows/changelog-preview.yml@ba01e596c4a4c07692f0de10b0d4fe05f3dd0292 # v2
1919
secrets: inherit

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
run: ./gradlew :sentry-android-integration-tests:test-app-sentry:assembleRelease
107107

108108
- name: Collect app metrics
109-
uses: getsentry/action-app-sdk-overhead-metrics@ecce2e2718b6d97ad62220fca05627900b061ed5
109+
uses: getsentry/action-app-sdk-overhead-metrics@44fb5489ac4ac252c87d84811972dc93a1e490b8
110110
with:
111111
config: sentry-android-integration-tests/metrics-test.yml
112112
sauce-user: ${{ secrets.SAUCE_USERNAME }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
fetch-depth: 0
3535
submodules: 'recursive'
3636
- name: Prepare release
37-
uses: getsentry/craft@013a7b2113c2cac0ff32d5180cfeaefc7c9ce5b6 # v2
37+
uses: getsentry/craft@ba01e596c4a4c07692f0de10b0d4fe05f3dd0292 # v2
3838
env:
3939
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
4040
with:

.github/workflows/validate-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
permissions:
1111
pull-requests: write
1212
steps:
13-
- uses: getsentry/github-workflows/validate-pr@0b52fc6a867b744dcbdf5d25c18bc8d1c95710e1
13+
- uses: getsentry/github-workflows/validate-pr@71588ddf95134f804e82c5970a8098588e2eaecd
1414
with:
1515
app-id: ${{ vars.SDK_MAINTAINER_BOT_APP_ID }}
1616
private-key: ${{ secrets.SDK_MAINTAINER_BOT_PRIVATE_KEY }}

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,6 @@ spy.log
3434
# Local Claude Code settings/state that should not be committed
3535
.claude/settings.local.json
3636
.claude/worktrees/
37+
# Auto-generated by dotagents — do not commit these files.
38+
agents.lock
39+
.agents/.gitignore

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
## Unreleased
44

5+
### Dependencies
6+
7+
- Bump Native SDK from v0.13.3 to v0.13.6 ([#5277](https://github.com/getsentry/sentry-java/pull/5277))
8+
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0136)
9+
- [diff](https://github.com/getsentry/sentry-native/compare/0.13.3...0.13.6)
10+
11+
## 8.38.0
12+
513
### Features
614

715
- Prevent cross-organization trace continuation ([#5136](https://github.com/getsentry/sentry-java/pull/5136))
@@ -11,6 +19,10 @@
1119
- Android: Attachments on the scope will now be synced to native ([#5211](https://github.com/getsentry/sentry-java/pull/5211))
1220
- Add THIRD_PARTY_NOTICES.md for vendored third-party code, bundled as SENTRY_THIRD_PARTY_NOTICES.md in the sentry JAR under META-INF ([#5186](https://github.com/getsentry/sentry-java/pull/5186))
1321

22+
### Improvements
23+
24+
- Do not retrieve `ActivityManager` if API < 35 on SDK init ([#5275](https://github.com/getsentry/sentry-java/pull/5275))
25+
1426
## 8.37.1
1527

1628
### Fixes

agents.toml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Whenever you make changes to this file, run the following to update all generated dotagent files
2+
# npx @sentry/dotagents install
3+
# npx @sentry/dotagents sync
4+
5+
version = 1
6+
7+
[[skills]]
8+
name = "dotagents"
9+
source = "getsentry/dotagents"
10+
11+
[[skills]]
12+
name = "sentry-workflow"
13+
source = "getsentry/sentry-for-ai"
14+
15+
[[skills]]
16+
name = "sentry-fix-issues"
17+
source = "getsentry/sentry-for-ai"
18+
19+
[[skills]]
20+
name = "sentry-code-review"
21+
source = "getsentry/sentry-for-ai"
22+
23+
[[skills]]
24+
name = "sentry-pr-code-review"
25+
source = "getsentry/sentry-for-ai"
26+
27+
[[skills]]
28+
name = "create-java-pr"
29+
source = "path:.agents/skills/create-java-pr"
30+
31+
[[skills]]
32+
name = "test"
33+
source = "path:.agents/skills/test"

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ android.useAndroidX=true
1212
android.experimental.lint.version=8.9.0
1313

1414
# Release information
15-
versionName=8.37.1
15+
versionName=8.38.0
1616

1717
# Override the SDK name on native crashes on Android
1818
sentryAndroidSdkName=sentry.native.android

0 commit comments

Comments
 (0)