Update v9 branch

.claude/skills/create-java-pr/SKILL.md

@@ -74,7 +74,7 @@ Derive the branch name from the changes being made. Use `feat/`, `fix/`, `ref/`,
 ## Step 2: Format Code and Regenerate API Files
 
 ```bash
-./gradlew spotlessApply apiDump
+./gradlew spotlessApply updateKotlinAbi
 ```
 
 This is **required** before every PR in this repo. It formats all Java/Kotlin code via Spotless and regenerates the `.api` binary compatibility files.

.claude/skills/test/SKILL.md

@@ -32,6 +32,7 @@ Extract the module name and optional test class filter from the argument.
 | Signal | Test Type |
 |--------|-----------|
 | Path contains `/src/integrationTest*/` or `/src/agentFixture/` | Integration test suite |
+| Module name only, and the user asks for integration or end-to-end tests | Integration test suite: each `src/integrationTest*/` directory of the module |
 | Path contains `sentry-samples/`, or module name starts with `sentry-samples-` | None: samples have no tests |
 | Everything else | Unit test |
 

.craft.yml

@@ -1,5 +1,9 @@
-minVersion: 0.29.3
-changelogPolicy: auto
+minVersion: 3.9.0
+changelog:
+  policy: auto
+preReleaseCommand: bash scripts/bump-version.sh
+versioning:
+  policy: manual
 targets:
   - name: maven
     includeNames: /^sentry.*$/

.cursor/BUGBOT.md

@@ -120,6 +120,6 @@ rule file in [`.cursor/rules/`](rules) for the area the diff touches (`api`, `op
 ## What NOT to flag
 
 - Formatting and import order — Spotless owns it.
-- Contents of generated `.api` files, beyond confirming `apiDump` was run.
+- Contents of generated `.api` files, beyond confirming `updateKotlinAbi` was run.
 - Conventional commit / PR title format, and missing changelog entries — CI and Danger check both.
 - Speculative refactors or improvements unrelated to the diff.

.cursor/rules/api.mdc

@@ -6,9 +6,9 @@ description: Public API surface, binary compatibility, and common classes to mod
 
 ## API Compatibility
 
-Public API is tracked via `.api` files generated by the [Binary Compatibility Validator](https://github.com/Kotlin/binary-compatibility-validator) Gradle plugin. Each module has its own file at `<module>/api/<module>.api`.
+Public API is tracked via `.api` files generated by the [ABI validation](https://kotlinlang.org/docs/gradle-binary-compatibility-validation.html) built into the Kotlin Gradle plugin. Each module has its own file at `<module>/api/<module>.api`.
 
-- **Never edit `.api` files manually.** Run `./gradlew apiDump` to regenerate them.
+- **Never edit `.api` files manually.** Run `./gradlew updateKotlinAbi` to regenerate them.
 - `./gradlew check` validates current code against `.api` files and fails on unintended changes.
 - `@ApiStatus.Internal` marks classes/methods as internal — they still appear in `.api` files but are not part of the public contract.
 - `@ApiStatus.Experimental` marks API that may change in future versions.

.cursor/rules/e2e_tests.mdc

@@ -64,9 +64,18 @@ it. Gradle runs the two in parallel.
 
 ## Running them
 
-- The `spring-boot-{2,3,4}-matrix.yml` workflows run the suites against each supported Spring Boot
-  version, by setting the version in `gradle/libs.versions.toml`. The suites aren't part of
-  `check`, so a new suite only runs on CI once it's added to its matrix.
+- The `springBootMatrix` block in each Spring module's build file runs its suites on every version
+  of its Spring Boot line in `gradle/spring-boot-versions.json`, with a task per suite and version,
+  e.g. `integrationTestWebfluxBoot3_2_12`. The suites and the SDK compile once, against the
+  catalog's version; only the runtime classpath changes. `allIntegrationTestsBoot3_2_12` runs one
+  version's suites, `allIntegrationTestsBoot3` every version's.
+- The `spring-boot-{2,3,4}-matrix.yml` workflows read the same file and run each version in its own
+  job, e.g. `./gradlew :sentry-spring-jakarta:allIntegrationTestsBoot3_2_12
+  :sentry-spring-boot-jakarta:allIntegrationTestsBoot3_2_12`. The suites aren't part of `check`, so
+  a new suite only runs on CI once it's added to its module's `springBootMatrix` block, and a new
+  module once it's added to its workflow.
+- Suite code may only use APIs that exist in the oldest version of its line. Compiled against a
+  newer one, a missing API fails at runtime with `NoSuchMethodError` or `NoClassDefFoundError`.
 
 ## Gotchas
 

.cursor/rules/options.mdc

@@ -112,4 +112,4 @@ When a feature has its own capture path (e.g. `captureLog`), the relevant classe
 4. `ManifestMetadataReader.java` — Android manifest support (if Android-relevant)
 5. `SentryAutoConfigurationTest.kt` — Spring Boot property binding tests (all three Spring Boot modules)
 6. Tests for all of the above (`SentryOptionsTest`, `ExternalOptionsTest`, `ManifestMetadataReaderTest`)
-7. Run `./gradlew apiDump` — the nested class and its methods appear in `sentry.api`
+7. Run `./gradlew updateKotlinAbi` — the nested class and its methods appear in `sentry.api`

.github/CODEOWNERS

@@ -1 +1 @@
-*       @adinauer @romtsn @markushi @runningcode @0xadam-brown
+*       @getsentry/team-mobile-android-sdk @adinauer

.github/workflows/agp-matrix.yml

@@ -24,13 +24,10 @@ jobs:
     env:
       VERSION_AGP: ${{ matrix.agp }}
       APPLY_SENTRY_INTEGRATIONS: ${{ matrix.integrations }}
-      GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
     steps:
       - name: Checkout Repo
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-        with:
-          submodules: 'recursive'
 
       - name: Setup Java Version
         uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
@@ -39,9 +36,7 @@ jobs:
           java-version: '21'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
-        with:
-          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+        uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
 
       - name: Enable KVM
         run: |

.github/workflows/build.yml

@@ -15,33 +15,20 @@ jobs:
     name: Build Job ubuntu-latest
     runs-on: ubuntu-latest
 
-    env:
-      GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-
     steps:
       - name: Checkout Repo
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
-          submodules: 'recursive'
 
       - name: Setup Java Version
         uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
         with:
           distribution: 'temurin'
           java-version: '21'
 
-      # Workaround for https://github.com/gradle/actions/issues/21 to use config cache
-      - name: Cache buildSrc
-        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        with:
-          path: buildSrc/build
-          key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}
-
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
-        with:
-          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+        uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
 
       - name: Run Tests and Lint
         run: make preMerge

.github/workflows/codeql-analysis.yml

@@ -15,14 +15,9 @@ jobs:
     name: Analyze
     runs-on: macos-15
 
-    env:
-      GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-
     steps:
       - name: Checkout Repo
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-        with:
-          submodules: 'recursive'
 
       - name: Setup Java Version
         uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
@@ -31,9 +26,7 @@ jobs:
           java-version: '21'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
-        with:
-          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+        uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@9b3254085494b55a0f7c4c2b3d2d52cc712ce370 # pin@v2

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

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
+        uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
 
       - name: Set up Java
         uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0

.github/workflows/format-code.yml

@@ -9,8 +9,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-        with:
-          submodules: 'recursive'
 
       - name: set up JDK 17
         uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
@@ -19,9 +17,7 @@ jobs:
           java-version: '21'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
-        with:
-          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+        uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
 
       - name: Format with spotlessApply
         run: ./gradlew spotlessApply

.github/workflows/generate-javadocs.yml

@@ -10,8 +10,6 @@ jobs:
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-        with:
-          submodules: 'recursive'
 
       - name: set up JDK 17
         uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
@@ -20,7 +18,7 @@ jobs:
           java-version: '21'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
+        uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
 
       - name: Generate Aggregate Javadocs
         run: |

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

@@ -29,7 +29,7 @@ jobs:
           java-version: '21'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
+        uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
 
       - name: Assemble target app and Macrobenchmark apk
         if: env.SAUCE_USERNAME != null

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

@@ -15,9 +15,6 @@ jobs:
     name: Build and Analyze SDK Size
     runs-on: ubuntu-latest
 
-    env:
-      GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-
     steps:
       - name: Checkout Repo
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -28,17 +25,8 @@ jobs:
           distribution: "temurin"
           java-version: "21"
 
-      # Workaround for https://github.com/gradle/actions/issues/21 to use config cache
-      - name: Cache buildSrc
-        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        with:
-          path: buildSrc/build
-          key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}
-
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
-        with:
-          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+        uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
 
       - name: Size Analysis
         run: ./gradlew :sentry-android-integration-tests:test-app-size:bundleRelease

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

@@ -22,9 +22,6 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
 
-    env:
-      GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-
     steps:
       - name: Checkout code
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -36,9 +33,7 @@ jobs:
           java-version: '21'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
-        with:
-          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+        uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
 
       - name: Build debug APK
         run: make assembleUiTestCriticalRelease

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

@@ -18,13 +18,10 @@ jobs:
     env:
       SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
       SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-      GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
     steps:
       - name: Git checkout
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-        with:
-          submodules: 'recursive'
 
       - name: 'Set up Java: 17'
         uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
@@ -33,9 +30,7 @@ jobs:
           java-version: '21'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
-        with:
-          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+        uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
 
       # Clean, build and release a test apk, but only if we will run the benchmark
       - name: Make assembleUiTests

.github/workflows/release-build.yml

@@ -16,8 +16,6 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-        with:
-          submodules: 'recursive'
 
       - name: Setup Java Version
         uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
@@ -26,7 +24,7 @@ jobs:
           java-version: '21'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@3f5f9adaf7d9fecd50b5935e54106014257a94e6 # v6.4.0
+        uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
 
       - name: Build artifacts
         run: make publish

.github/workflows/release.yml

@@ -32,9 +32,8 @@ jobs:
           token: ${{ steps.token.outputs.token }}
           # Needs to be set, otherwise git describe --tags will fail with: No names found, cannot describe anything
           fetch-depth: 0
-          submodules: 'recursive'
       - name: Prepare release
-        uses: getsentry/craft@924b450ede4af30e30de4821a4b357d676c8df92 # v3
+        uses: getsentry/craft@2e29b0819113d334c15da3d8cac2138cb9dc111a # 3.9.0
         env:
           GITHUB_TOKEN: ${{ steps.token.outputs.token }}
         with: