@@ -74,10 +74,10 @@ Derive the branch name from the changes being made. Use `feat/`, `fix/`, `ref/`,
 ## Step 2: Format Code and Regenerate API Files
 
 ```bash
-./gradlew spotlessApply updateKotlinAbi
+make format api
 ```
 
-This is **required** before every PR in this repo. It formats all Java/Kotlin code via Spotless and regenerates the `.api` binary compatibility files.
+This is **required** before every PR in this repo. It formats all Java/Kotlin code via Spotless, including the separate builds the root `spotlessApply` doesn't reach, and regenerates the `.api` binary compatibility files.
 
 If the command fails, diagnose and fix the issue before continuing.
 
 
@@ -7,7 +7,11 @@ registries:
     password: dummy # Required by dependabot
 updates:
   - package-ecosystem: "gradle"
-    directory: "/"
+    # The root build doesn't include the separate sample and test builds.
+    directories:
+      - "/"
+      - "/sentry-samples/sentry-samples-android"
+      - "/sentry-android-integration-tests"
     registries:
       - gradle-plugin-portal
     schedule:
 
@@ -20,7 +20,7 @@ jobs:
         uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
 
       - name: Format with spotlessApply
-        run: ./gradlew spotlessApply
+        run: make format
 
       # actions/checkout fetches only a single commit in a detached HEAD state. Therefore
       # we need to pass the current branch, otherwise we can't commit the changes.
 
@@ -1,5 +1,5 @@
 name: 'Integration Tests - Macrobenchmark'
-# Runs the sentry-uitest-android-macrobenchmark cold-start benchmark on a Sauce Labs real
+# Runs the sentry-samples-android macrobenchmark cold-start benchmark on a Sauce Labs real
 # device and recovers timeToInitialDisplay from the device log.
 #
 on:
@@ -33,7 +33,7 @@ jobs:
 
       - name: Assemble target app and Macrobenchmark apk
         if: env.SAUCE_USERNAME != null
-        run: ./gradlew :sentry-samples:sentry-samples-android:assembleRelease :sentry-android-integration-tests:sentry-uitest-android-macrobenchmark:assembleBenchmark
+        run: ./gradlew -p sentry-samples/sentry-samples-android :assembleRelease :macrobenchmark:assembleBenchmark
 
       - name: Run Macrobenchmark in SauceLab
         uses: saucelabs/saucectl-run-action@283660aa934c02723c497efa151d582a3acc5801 # pin@v3
 
@@ -29,6 +29,6 @@ jobs:
         uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
 
       - name: Size Analysis
-        run: ./gradlew :sentry-android-integration-tests:test-app-size:bundleRelease
+        run: ./gradlew -p sentry-android-integration-tests :test-app-size:bundleRelease
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
@@ -0,0 +1,50 @@
+name: 'Samples'
+# Runs `check` in each build the SDK build doesn't include, so a broken sample or
+# integration test fails its own job instead of the SDK's Build job.
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  check:
+    name: Check ${{ matrix.name }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: sentry-samples-android
+            path: sentry-samples/sentry-samples-android
+          - name: sentry-android-integration-tests
+            path: sentry-android-integration-tests
+
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: Setup Java Version
+        uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
+
+      - name: Run Tests and Lint
+        run: ./gradlew -p ${{ matrix.path }} check
+
+      - name: Upload test results
+        if: always()
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
+        with:
+          name: test-results-${{ matrix.name }}
+          path: |
+            **/build/reports/*
@@ -15,7 +15,7 @@ defaults:
 
 espresso:
   app: ./sentry-samples/sentry-samples-android/build/outputs/apk/release/sentry-samples-android-release.apk
-  testApp: ./sentry-android-integration-tests/sentry-uitest-android-macrobenchmark/build/outputs/apk/benchmark/sentry-uitest-android-macrobenchmark-benchmark.apk
+  testApp: ./sentry-samples/sentry-samples-android/macrobenchmark/build/outputs/apk/benchmark/macrobenchmark-benchmark.apk
 
 suites:
 
 
@@ -41,8 +41,8 @@ The project uses **Gradle** with Kotlin DSL. Key build files:
 ## Essential Commands
 
 ```bash
-# Format code and regenerate .api files (REQUIRED before committing)
-./gradlew spotlessApply updateKotlinAbi
+# Format code in every build and regenerate .api files (REQUIRED before committing)
+make format api
 
 # Run all tests and linter
 ./gradlew check
@@ -59,11 +59,14 @@ resolves the per-module test task, including integration test suites, for you.
 
 ### Android-Specific Commands
 ```bash
-# Assemble Android test APKs
-./gradlew :sentry-android-integration-tests:sentry-uitest-android:assembleRelease :sentry-android-integration-tests:sentry-uitest-android:assembleAndroidTest
+# Assemble Android test APKs, in a separate Gradle build that includes this one
+./gradlew -p sentry-android-integration-tests :sentry-uitest-android:assembleRelease :sentry-uitest-android:assembleAndroidTest
 
 # Run critical UI tests
 ./scripts/test-ui-critical.sh
+
+# Build the Android sample, a separate Gradle build that includes this one
+./gradlew -p sentry-samples/sentry-samples-android assembleDebug
 ```
 
 ## Development Workflow Rules
@@ -74,7 +77,7 @@ resolves the per-module test task, including integration test suites, for you.
 3. **Use todo tracking**: Work through todo items, marking them as complete as you go
 4. **High-level communication**: Give high-level explanations of changes made, not step-by-step descriptions
 5. **Simplicity first**: Make every task and code change as simple as possible. Avoid massive or complex changes. Impact as little code as possible.
-6. **Format and regenerate**: Once done, format code and regenerate .api files: `./gradlew spotlessApply updateKotlinAbi`
+6. **Format and regenerate**: Once done, format code and regenerate .api files: `make format api`
 7. **Propose commit**: As final step, git stage relevant files and propose (but not execute) a single git commit command. This applies to implementation work; when the task is to open a PR, the `create-java-pr` skill takes over from here and does commit, push, and open it.
 
 ## Repository Skills
@@ -110,7 +113,7 @@ The repository is organized into multiple modules:
 
 ### Utility Modules
 - **`sentry-test-support`** - Shared test utilities, including `MockSentryServer` and envelope matchers
-- **`sentry-samples`** - Example applications
+- **`sentry-samples`** - Example applications. `sentry-samples-android` is a separate Gradle build that includes this one, so root tasks such as `check` and `spotlessApply` don't reach it
 - **`sentry-bom`** - Bill of Materials for dependency management
 
 ### Key Architectural Patterns
 
@@ -73,11 +73,7 @@ To format the changed code and make CI happy you can run:
 make format
 ```
 
-or
-
-```shell
-./gradlew spotlessApply
-```
+`./gradlew spotlessApply` alone formats only the SDK build, not the separate builds it doesn't include, such as the Android sample.
 
 # Binary compatibility validation
 
 
@@ -1,4 +1,4 @@
-.PHONY: all clean compile javadocs dryRelease update checkFormat api assembleUiTestRelease assembleUiTestCriticalRelease runUiTestCritical check preMerge publish
+.PHONY: all clean compile javadocs dryRelease update format checkFormat api assembleUiTestRelease assembleUiTestCriticalRelease runUiTestCritical check preMerge publish
 
 all: stop clean javadocs compile
 assembleUiTests: assembleUiTestRelease
@@ -25,21 +25,29 @@ dryRelease:
 update:
 	./gradlew dependencyUpdates -Drevision=release
 
+# Spotless formats the code. The root spotlessApply doesn't reach the separate builds.
+format:
+	./gradlew spotlessApply
+	./gradlew -p sentry-samples/sentry-samples-android spotlessApply
+	./gradlew -p sentry-android-integration-tests spotlessApply
+
 # Spotless check's code
 checkFormat:
 	./gradlew spotlessJavaCheck spotlessKotlinCheck
+	./gradlew -p sentry-samples/sentry-samples-android spotlessJavaCheck spotlessKotlinCheck
+	./gradlew -p sentry-android-integration-tests spotlessJavaCheck spotlessKotlinCheck
 
 # Binary compatibility validator
 api:
 	./gradlew updateKotlinAbi
 
 # Assemble release and Android test apk of the uitest-android module
 assembleUiTestRelease:
-	./gradlew :sentry-android-integration-tests:sentry-uitest-android:assembleRelease :sentry-android-integration-tests:sentry-uitest-android:assembleAndroidTest
+	./gradlew -p sentry-android-integration-tests :sentry-uitest-android:assembleRelease :sentry-uitest-android:assembleAndroidTest
 
 # Assemble release of the uitest-android-critical module
 assembleUiTestCriticalRelease:
-	./gradlew :sentry-android-integration-tests:sentry-uitest-android-critical:assembleRelease
+	./gradlew -p sentry-android-integration-tests :sentry-uitest-android-critical:assembleRelease
 
 # Run Maestro tests for the uitest-android-critical module
 runUiTestCritical: