Skip to content

Commit ce39215

Browse files
buenaflorbuenaflor
authored
Merge branch 'main' into feat/standalone-app-start-tracing
2 parents c627678 + 887fd58 commit ce39215

46 files changed

Lines changed: 1186 additions & 293 deletions

Some content is hidden

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

‎.cursor/rules/coding.mdc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ sentry-java is the Java and Android SDK for Sentry. This repository contains the
2424
./gradlew check
2525

2626
# Run unit tests for a specific file
27-
./gradle ':<module>:testDebugUnitTest' --tests="*<file name>*" --info
27+
./gradlew ':<module>:testDebugUnitTest' --tests="*<file name>*" --info
2828
```
2929

3030
## Contributing Guidelines
3131

3232
1. Follow existing code style and language
33-
2. Do not modify the API files (e.g. sentry.api) manually, instead run `./gradlew apiDump` to regenerate them
33+
2. Do not modify the API files (e.g. sentry.api) manually, instead run `./gradlew apiDump` to regenerate them
3434
3. Write comprehensive tests
3535
4. New features should always be opt-in by default, extend `SentryOptions` or similar Option classes with getters and setters to enable/disable a new feature
3636
5. Consider backwards compatibility

‎.cursor/rules/pr.mdc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ Entry format:
9393
- <Short description> ([#<PR_NUMBER>](https://github.com/getsentry/sentry-java/pull/<PR_NUMBER>))
9494
```
9595

96+
**When rebasing:** A rebase onto `main` can land your branch after a release was cut, where the `## Unreleased` heading your entry lived under has since been renamed to that version number. If that happens, move your new entry into an `## Unreleased` section at the top of `CHANGELOG.md` (create the section if it no longer exists) so it is not left under an already-released version.
97+
9698
Commit changelog separately:
9799

98100
```bash

‎.github/workflows/agp-matrix.yml‎

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

2929
steps:
3030
- name: Checkout Repo
31-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
31+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
3232
with:
3333
submodules: 'recursive'
3434

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout Repo
22-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
22+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
2323
with:
2424
ref: ${{ github.event.pull_request.head.sha || github.sha }}
2525
submodules: 'recursive'
@@ -58,7 +58,7 @@ jobs:
5858
SENTRY_PROJECT: sentry-android
5959

6060
- name: Upload coverage to Codecov
61-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # pin@v4
61+
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # pin@v4
6262
with:
6363
name: sentry-java
6464
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@bae212ca7aec50bb716eafd387c80bcfb28da937 # v2
18+
uses: getsentry/craft/.github/workflows/changelog-preview.yml@4468eb9e399655a61c770534dacc03139d98aa18 # v2
1919
secrets: inherit

‎.github/workflows/changes-in-high-risk-code.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
high_risk_code: ${{ steps.changes.outputs.high_risk_code }}
1717
high_risk_code_files: ${{ steps.changes.outputs.high_risk_code_files }}
1818
steps:
19-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
19+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
2020
- name: Get changed files
2121
id: changes
2222
uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1

‎.github/workflows/check-tombstone-proto-schema.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
13+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
1414

1515
- name: Check for newer Tombstone proto schema
1616
run: ./scripts/check-tombstone-proto-schema.sh

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout Repo
23-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
23+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
2424
with:
2525
submodules: 'recursive'
2626

@@ -36,7 +36,7 @@ jobs:
3636
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3737

3838
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@68bde559dea0fdcac2102bfdf6230c5f70eb485e # pin@v2
39+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # 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@68bde559dea0fdcac2102bfdf6230c5f70eb485e # pin@v2
48+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # pin@v2

‎.github/workflows/danger.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ jobs:
88
danger:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: getsentry/github-workflows/danger@26f565c05d0dd49f703d238706b775883037d76b # v3
11+
- uses: getsentry/github-workflows/danger@607fed74f812e69201531a5185b6c3c57caa4e89 # v3

‎.github/workflows/enforce-license-compliance.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: Checkout
23-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
23+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
2424

2525
# TODO: remove this when upstream is fixed
2626
- name: Disable Gradle configuration cache (see https://github.com/fossas/fossa-cli/issues/872)

0 commit comments

Comments
 (0)