diff --git a/.claude/skills/create-java-pr/SKILL.md b/.claude/skills/create-java-pr/SKILL.md
index 70bc4453a58..ef813f4b1c8 100644
--- a/.claude/skills/create-java-pr/SKILL.md
+++ b/.claude/skills/create-java-pr/SKILL.md
@@ -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.
 
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2824699563c..8e712646a1e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -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:
diff --git a/.github/workflows/format-code.yml b/.github/workflows/format-code.yml
index fb1a1da7102..e55cddb74fd 100644
--- a/.github/workflows/format-code.yml
+++ b/.github/workflows/format-code.yml
@@ -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.
diff --git a/.github/workflows/integration-tests-macrobenchmark.yml b/.github/workflows/integration-tests-macrobenchmark.yml
index 654e8c17f76..eb1778adcd8 100644
--- a/.github/workflows/integration-tests-macrobenchmark.yml
+++ b/.github/workflows/integration-tests-macrobenchmark.yml
@@ -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
diff --git a/.github/workflows/integration-tests-size.yml b/.github/workflows/integration-tests-size.yml
index 9705499f430..4254edcf4b2 100644
--- a/.github/workflows/integration-tests-size.yml
+++ b/.github/workflows/integration-tests-size.yml
@@ -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 }}
diff --git a/.github/workflows/samples.yml b/.github/workflows/samples.yml
new file mode 100644
index 00000000000..c0376a85328
--- /dev/null
+++ b/.github/workflows/samples.yml
@@ -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/*
diff --git a/.sauce/sentry-uitest-android-macrobenchmark.yml b/.sauce/sentry-uitest-android-macrobenchmark.yml
index 4e3d5cfbb3d..a6ef85e7c4a 100644
--- a/.sauce/sentry-uitest-android-macrobenchmark.yml
+++ b/.sauce/sentry-uitest-android-macrobenchmark.yml
@@ -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:
 
diff --git a/AGENTS.md b/AGENTS.md
index 68a7bdfb74e..8895b5fb658 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -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
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 77714917518..d0642308ff8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -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
 
diff --git a/Makefile b/Makefile
index c5bb6ac2313..d88f81d09ab 100644
--- a/Makefile
+++ b/Makefile
@@ -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,9 +25,17 @@ 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:
@@ -35,11 +43,11 @@ api:
 
 # 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:
diff --git a/build-logic/src/main/kotlin/io/sentry/gradle/JdkTargetConvention.kt b/build-logic/src/main/kotlin/io/sentry/gradle/JdkTargetConvention.kt
index 73202bbb3f3..0b4c54ce906 100644
--- a/build-logic/src/main/kotlin/io/sentry/gradle/JdkTargetConvention.kt
+++ b/build-logic/src/main/kotlin/io/sentry/gradle/JdkTargetConvention.kt
@@ -33,9 +33,23 @@ private val PUBLISHED_JAVA_VERSION = JavaVersion.VERSION_1_8
  *   archives are checked for it
  * - published Android modules main code targets Java 1.8
  * - minSdk is set for Android libraries
+ * - javac warnings fail the build
  */
 class JdkTargetConvention : Plugin<Project> {
   override fun apply(project: Project) {
+    project.tasks.withType(JavaCompile::class.java).configureEach {
+      options.compilerArgs.addAll(
+        listOf(
+          "-Xlint:all",
+          "-Werror",
+          "-Xlint:-classfile",
+          "-Xlint:-processing",
+          "-Xlint:-try",
+          "-Xlint:-options",
+        )
+      )
+    }
+
     project.plugins.withType(JavaBasePlugin::class.java) {
       project.extensions.getByType(JavaPluginExtension::class.java).toolchain {
         languageVersion.set(BUILD_JDK)
diff --git a/buildSrc/src/main/java/MergeSpringMetadataAction.kt b/build-logic/src/main/kotlin/io/sentry/gradle/MergeSpringMetadataAction.kt
similarity index 99%
rename from buildSrc/src/main/java/MergeSpringMetadataAction.kt
rename to build-logic/src/main/kotlin/io/sentry/gradle/MergeSpringMetadataAction.kt
index 2df744924cb..ac73e21f588 100644
--- a/buildSrc/src/main/java/MergeSpringMetadataAction.kt
+++ b/build-logic/src/main/kotlin/io/sentry/gradle/MergeSpringMetadataAction.kt
@@ -1,3 +1,5 @@
+package io.sentry.gradle
+
 import java.net.URI
 import java.nio.file.FileSystems
 import java.nio.file.Files
diff --git a/build.gradle.kts b/build.gradle.kts
index f4f59786f45..fff33104ae9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,7 +19,7 @@ plugins {
     alias(libs.plugins.gradle.versions) apply false
     alias(libs.plugins.spring.dependency.management) apply false
     id("io.sentry.javadoc.aggregate")
-    alias(libs.plugins.sentry) apply false
+    alias(libs.plugins.android.application) apply false
 }
 
 buildscript {
@@ -27,11 +27,6 @@ buildscript {
         google()
     }
     dependencies {
-        classpath(Config.BuildPlugins.androidGradle)
-
-        // add classpath of sentry android gradle plugin
-        // classpath("io.sentry:sentry-android-gradle-plugin:{version}")
-
         classpath(libs.commons.compress)
     }
 }
@@ -50,9 +45,6 @@ allprojects {
                 TestLogEvent.FAILED
             )
         }
-        withType<JavaCompile>().configureEach {
-            options.compilerArgs.addAll(arrayOf("-Xlint:all", "-Werror", "-Xlint:-classfile", "-Xlint:-processing", "-Xlint:-try", "-Xlint:-options"))
-        }
     }
 }
 
diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
index 140805224a4..6a233274530 100644
--- a/buildSrc/src/main/java/Config.kt
+++ b/buildSrc/src/main/java/Config.kt
@@ -1,14 +1,9 @@
 
 object Config {
-    val AGP = System.getenv("VERSION_AGP") ?: "9.4.0"
     val kotlinStdLib = "stdlib-jdk8"
     val kotlinStdLibVersionAndroid = "1.9.24"
     val kotlinTestJunit = "test-junit"
 
-    object BuildPlugins {
-        val androidGradle = "com.android.tools.build:gradle:$AGP"
-    }
-
     object Android {
         val abiFilters = listOf("x86", "armeabi-v7a", "x86_64", "arm64-v8a")
 
diff --git a/gradle.properties b/gradle.properties
index eeefd38c92d..417334e771c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,6 @@ android.useAndroidX=true
 # AGP 9+ migration opt-outs until we remove kotlin-android plugin and adopt built-in Kotlin.
 android.builtInKotlin=false
 android.newDsl=false
-android.experimental.lint.version=9.4.0
 
 android.disableAgpUpgradePrompt=true
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 25681bf9137..cc0d16d8ecc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -40,8 +40,7 @@ retrofit = "2.9.0"
 room2 = "2.8.4"
 room3 = "3.0.0-rc01"
 sagp = "6.13.0"
-# Compile-time only, for the AGP types the build-logic convention plugins use. The AGP that
-# actually runs the build comes from the root buildscript (Config.AGP, overridable via VERSION_AGP).
+# The AGP matrix job overrides this with the VERSION_AGP env var, through each build's settings.
 agp = "9.4.0"
 sqlite = "2.6.2"
 sqliteRc = "2.7.0-rc01" # Required by Room3 3.0.0-rc*
@@ -62,6 +61,7 @@ compileSdkMinor = "2"
 minSdk = "21"
 
 [plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
diff --git a/scripts/test-ui-android.sh b/scripts/test-ui-android.sh
index 4567f96afc4..d81c683aff3 100755
--- a/scripts/test-ui-android.sh
+++ b/scripts/test-ui-android.sh
@@ -9,7 +9,7 @@ out_dir=$1
 device_dir=/sdcard/Download/sentry_replay_snapshots
 
 test_status=0
-./gradlew sentry-android-integration-tests:sentry-uitest-android:connectedReleaseAndroidTest || test_status=$?
+./gradlew -p sentry-android-integration-tests :sentry-uitest-android:connectedReleaseAndroidTest || test_status=$?
 
 mkdir -p "$out_dir"
 if adb shell test -d "$device_dir"; then
diff --git a/sentry-android-integration-tests/README.md b/sentry-android-integration-tests/README.md
index 4b3c495a978..2e84e1cbd06 100644
--- a/sentry-android-integration-tests/README.md
+++ b/sentry-android-integration-tests/README.md
@@ -1,4 +1,10 @@
 # Android performance-impact and integration tests
 
+This directory is a separate Gradle build that includes the SDK build, so run its tasks with
+`./gradlew -p sentry-android-integration-tests <task>`. The SDK build doesn't include it, so
+`./gradlew` from the repository root doesn't build, lint or format these apps.
+`gradle.properties`, `gradlew`, `gradle/wrapper` and `gradle/gradle-daemon-jvm.properties` are
+symlinks to the SDK build's, so both builds use the same Gradle, JDK and settings.
+
 * [Espresso-based UI tests](./sentry-uitest-android) - run within SauceLabs (see /.sauce/*.yml)
   * Also used for compatibility test matrix against new AGP versions
diff --git a/sentry-android-integration-tests/build.gradle.kts b/sentry-android-integration-tests/build.gradle.kts
new file mode 100644
index 00000000000..53972e7fdb1
--- /dev/null
+++ b/sentry-android-integration-tests/build.gradle.kts
@@ -0,0 +1,9 @@
+plugins {
+  alias(libs.plugins.android.application) apply false
+  alias(libs.plugins.kotlin.android) apply false
+  alias(libs.plugins.kotlin.compose) apply false
+  alias(libs.plugins.errorprone) apply false
+  alias(libs.plugins.detekt) apply false
+  alias(libs.plugins.gradle.versions) apply false
+  alias(libs.plugins.sentry) apply false
+}
diff --git a/sentry-android-integration-tests/gradle.properties b/sentry-android-integration-tests/gradle.properties
new file mode 120000
index 00000000000..7677fb73be8
--- /dev/null
+++ b/sentry-android-integration-tests/gradle.properties
@@ -0,0 +1 @@
+../gradle.properties
\ No newline at end of file
diff --git a/sentry-android-integration-tests/gradle/gradle-daemon-jvm.properties b/sentry-android-integration-tests/gradle/gradle-daemon-jvm.properties
new file mode 120000
index 00000000000..284e270637d
--- /dev/null
+++ b/sentry-android-integration-tests/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1 @@
+../../gradle/gradle-daemon-jvm.properties
\ No newline at end of file
diff --git a/sentry-android-integration-tests/gradle/wrapper b/sentry-android-integration-tests/gradle/wrapper
new file mode 120000
index 00000000000..3232fe4e272
--- /dev/null
+++ b/sentry-android-integration-tests/gradle/wrapper
@@ -0,0 +1 @@
+../../gradle/wrapper
\ No newline at end of file
diff --git a/sentry-android-integration-tests/gradlew b/sentry-android-integration-tests/gradlew
new file mode 120000
index 00000000000..502f5a2d3ec
--- /dev/null
+++ b/sentry-android-integration-tests/gradlew
@@ -0,0 +1 @@
+../gradlew
\ No newline at end of file
diff --git a/sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts b/sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts
index dedce1bfa53..fc43a6ad062 100644
--- a/sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts
+++ b/sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts
@@ -1,4 +1,5 @@
 import io.gitlab.arturbosch.detekt.Detekt
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 
 plugins {
   id("com.android.application")
@@ -8,6 +9,8 @@ plugins {
   id("io.sentry.jdk-target")
 }
 
+val sentryVersion = libs.versions.sentry.get()
+
 android {
   compileSdk = libs.versions.compileSdk.get().toInt()
   compileSdkMinor = libs.versions.compileSdkMinor.get().toInt()
@@ -37,20 +40,18 @@ android {
   buildFeatures { compose = true }
   composeOptions { kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() }
   androidComponents.beforeVariants {
-    it.enable = !Config.Android.shouldSkipDebugVariant(it.buildType)
+    it.enable = it.buildType != "debug"
   }
 }
 
 dependencies {
-  implementation(
-    kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
-  )
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(libs.androidx.activity.compose)
   implementation(libs.androidx.compose.foundation)
   implementation(libs.androidx.compose.material3)
   implementation(libs.androidx.constraintlayout)
   implementation(libs.androidx.core)
-  implementation(projects.sentryAndroidCore)
+  implementation("io.sentry:sentry-android-core:$sentryVersion")
 }
 
 tasks.withType<Detekt>().configureEach {
diff --git a/sentry-android-integration-tests/sentry-uitest-android/README.md b/sentry-android-integration-tests/sentry-uitest-android/README.md
index 145df22485c..5150de4764a 100644
--- a/sentry-android-integration-tests/sentry-uitest-android/README.md
+++ b/sentry-android-integration-tests/sentry-uitest-android/README.md
@@ -5,7 +5,7 @@ By default the envelopes sent to relay are caught by a mock server which allows
 
 # How to use
 
-Simply run `./gradlew connectedCheck` to run all ui tests of all modules (requires a connected device, either physical or an emulator).
+Simply run `./gradlew -p sentry-android-integration-tests connectedCheck` to run all ui tests of all modules (requires a connected device, either physical or an emulator).
 
 # CI
 CI runs these tests on a GitHub Actions emulator in the AGP matrix workflow (`.github/workflows/agp-matrix.yml`).
diff --git a/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts b/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts
index 0af3e1bbb0d..382d3c15fdd 100644
--- a/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts
+++ b/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts
@@ -1,5 +1,6 @@
 import io.gitlab.arturbosch.detekt.Detekt
 import net.ltgt.gradle.errorprone.errorprone
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 
 plugins {
   id("com.android.application")
@@ -7,11 +8,13 @@ plugins {
   alias(libs.plugins.kotlin.compose)
   alias(libs.plugins.errorprone)
   alias(libs.plugins.gradle.versions)
-  id("io.sentry.detekt")
+  alias(libs.plugins.detekt)
   id("io.sentry.spotless")
   id("io.sentry.jdk-target")
 }
 
+val sentryVersion = libs.versions.sentry.get()
+
 android {
   compileSdk = libs.versions.compileSdk.get().toInt()
   compileSdkMinor = libs.versions.compileSdkMinor.get().toInt()
@@ -45,7 +48,7 @@ android {
 
   signingConfigs {
     getByName("debug") {
-      storeFile = rootProject.file("debug.keystore")
+      storeFile = file("../../debug.keystore")
       storePassword = "android"
       keyAlias = "androiddebugkey"
       keyPassword = "android"
@@ -86,15 +89,13 @@ if (applySentryIntegrations) {
 }
 
 dependencies {
-  implementation(
-    kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
-  )
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
 
   if (applySentryIntegrations) {
-    implementation(projects.sentryAndroid)
-    implementation(projects.sentryCompose)
+    implementation("io.sentry:sentry-android:$sentryVersion")
+    implementation("io.sentry:sentry-compose:$sentryVersion")
   } else {
-    implementation(projects.sentryAndroidCore)
+    implementation("io.sentry:sentry-android-core:$sentryVersion")
   }
   implementation(libs.androidx.appcompat)
   implementation(libs.androidx.activity.compose)
@@ -113,7 +114,7 @@ dependencies {
   errorprone(libs.nullaway)
 
   androidTestUtil(libs.androidx.test.orchestrator)
-  androidTestImplementation(projects.sentryTestSupport)
+  androidTestImplementation("io.sentry:sentry-test-support:$sentryVersion")
   androidTestImplementation(libs.androidx.test.core.ktx)
   androidTestImplementation(libs.androidx.test.espresso.core)
   androidTestImplementation(libs.androidx.test.ext.junit)
@@ -133,6 +134,12 @@ tasks.withType<JavaCompile>().configureEach {
   }
 }
 
+detekt {
+  buildUponDefaultConfig = true
+  allRules = true
+  config.setFrom(file("../../detekt.yml"))
+}
+
 tasks.withType<Detekt>().configureEach {
   // Target version of the generated JVM bytecode. It is used for type resolution.
   jvmTarget = JavaVersion.VERSION_1_8.toString()
diff --git a/sentry-android-integration-tests/settings.gradle.kts b/sentry-android-integration-tests/settings.gradle.kts
new file mode 100644
index 00000000000..5a0d060f7d7
--- /dev/null
+++ b/sentry-android-integration-tests/settings.gradle.kts
@@ -0,0 +1,66 @@
+pluginManagement {
+  repositories {
+    // Prefer local SAGP artifact if one exists; otherwise fall back to libs.versions.toml.
+    if (providers.gradleProperty("useSagp").isPresent) {
+      mavenLocal {
+        content {
+          includeGroup("io.sentry")
+          includeGroup("io.sentry.android.gradle")
+        }
+      }
+    }
+    mavenCentral()
+    gradlePluginPortal()
+    google()
+  }
+
+  // Every build in a composite must use the same AGP, so each build's settings applies the AGP
+  // matrix job's override.
+  System.getenv("VERSION_AGP")?.let { agpVersion ->
+    resolutionStrategy {
+      eachPlugin {
+        if (requested.id.id.startsWith("com.android")) {
+          useVersion(agpVersion)
+        }
+      }
+    }
+  }
+}
+
+plugins {
+  id("com.gradle.develocity") version "4.6.1"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "2.8.0"
+}
+
+develocity {
+  buildScan {
+    termsOfUseUrl.set("https://gradle.com/help/legal-terms-of-use")
+    termsOfUseAgree.set("yes")
+  }
+}
+
+dependencyResolutionManagement {
+  repositories {
+    google()
+    mavenCentral()
+    mavenLocal()
+  }
+  versionCatalogs {
+    create("libs") {
+      from(files("../gradle/libs.versions.toml"))
+      // gradle.properties links to the SDK build's, so versionName is the SDK version.
+      version("sentry", providers.gradleProperty("versionName").get())
+    }
+  }
+}
+
+rootProject.name = "sentry-android-integration-tests"
+
+includeBuild("..")
+
+// For the io.sentry.spotless and io.sentry.jdk-target convention plugins.
+includeBuild("../build-logic")
+
+include("sentry-uitest-android")
+include("sentry-uitest-android-critical")
+include("test-app-size")
diff --git a/sentry-android-integration-tests/test-app-size/build.gradle.kts b/sentry-android-integration-tests/test-app-size/build.gradle.kts
index 499e468cb09..678ae4103e0 100644
--- a/sentry-android-integration-tests/test-app-size/build.gradle.kts
+++ b/sentry-android-integration-tests/test-app-size/build.gradle.kts
@@ -5,6 +5,8 @@ plugins {
   id("io.sentry.jdk-target")
 }
 
+val sentryVersion = libs.versions.sentry.get()
+
 android {
   namespace = "io.sentry.tests.size"
   compileSdk = libs.versions.compileSdk.get().toInt()
@@ -15,7 +17,7 @@ android {
     minSdk = libs.versions.minSdk.get().toInt()
     targetSdk = libs.versions.targetSdk.get().toInt()
     versionCode = 1
-    versionName = project.version.toString()
+    versionName = sentryVersion
   }
 
   buildTypes {
@@ -33,7 +35,7 @@ android {
     targetCompatibility = JavaVersion.VERSION_17
   }
   androidComponents.beforeVariants {
-    it.enable = !Config.Android.shouldSkipDebugVariant(it.buildType)
+    it.enable = it.buildType != "debug"
   }
 }
 
@@ -44,12 +46,12 @@ configurations.configureEach {
 }
 
 dependencies {
-  implementation(projects.sentryAndroid)
-  implementation(projects.sentryAndroidTimber)
-  implementation(projects.sentryAndroidSqlite)
-  implementation(projects.sentryOkhttp)
-  implementation(projects.sentryCompose)
-  implementation(projects.sentryAndroidFragment)
+  implementation("io.sentry:sentry-android:$sentryVersion")
+  implementation("io.sentry:sentry-android-timber:$sentryVersion")
+  implementation("io.sentry:sentry-android-sqlite:$sentryVersion")
+  implementation("io.sentry:sentry-okhttp:$sentryVersion")
+  implementation("io.sentry:sentry-compose:$sentryVersion")
+  implementation("io.sentry:sentry-android-fragment:$sentryVersion")
 }
 
 sentry {
diff --git a/sentry-samples/sentry-samples-android/README.md b/sentry-samples/sentry-samples-android/README.md
index b065b91e955..2c2b328e43e 100644
--- a/sentry-samples/sentry-samples-android/README.md
+++ b/sentry-samples/sentry-samples-android/README.md
@@ -8,15 +8,19 @@ profiling) and integrations (Compose, OkHttp, SQLite, etc.).
 Install the app on your device or emulator:
 
 ```
-./gradlew :sentry-samples:sentry-samples-android:installDebug
+./gradlew -p sentry-samples/sentry-samples-android installDebug
 ```
 
-or simply open the project in Android Studio and run the `sentry-samples-android` configuration.
+or open the `sentry-samples/sentry-samples-android` directory in Android Studio and run the `sentry-samples-android` configuration.
+
+The sample is a separate Gradle build that includes the SDK build, so changes to the SDK show up in the next build of the sample, with nothing to publish first.
+The SDK build doesn't include the sample, so `./gradlew` from the repository root doesn't build, lint or format it.
+`gradle.properties`, `gradlew`, `gradle/wrapper` and `gradle/gradle-daemon-jvm.properties` are symlinks to the SDK build's, so both builds use the same Gradle, JDK and settings.
 
 You can also apply the [Sentry Android Gradle Plugin](https://github.com/getsentry/sentry-android-gradle-plugin) (SAGP) when building (not applied by default):
 
 ```
-./gradlew :sentry-samples:sentry-samples-android:installDebug -PuseSagp
+./gradlew -p sentry-samples/sentry-samples-android installDebug -PuseSagp
 ```
 
 In Android Studio, add `useSagp=` (empty value) to `gradle.properties`, or pass `-PuseSagp` as a Gradle project property.
@@ -55,7 +59,7 @@ Re-run `publishToMavenLocal` after each SAGP change.
 Then build from sentry-java:
 
 ```
-./gradlew :sentry-samples:sentry-samples-android:installDebug -PuseSagp
+./gradlew -p sentry-samples/sentry-samples-android installDebug -PuseSagp
 ```
 
 ## Viewing SDK output
diff --git a/sentry-samples/sentry-samples-android/build.gradle.kts b/sentry-samples/sentry-samples-android/build.gradle.kts
index 6cb5b3d6d6d..8fb29bb4ecd 100644
--- a/sentry-samples/sentry-samples-android/build.gradle.kts
+++ b/sentry-samples/sentry-samples-android/build.gradle.kts
@@ -5,18 +5,21 @@ import io.sentry.android.gradle.extensions.InstrumentationFeature
 import io.sentry.android.gradle.extensions.SentryPluginExtension
 import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.internal.extensions.stdlib.capitalized
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 
 plugins {
-  id("com.android.application")
+  alias(libs.plugins.android.application)
+  id("io.sentry.spotless")
+  id("io.sentry.jdk-target")
   alias(libs.plugins.kotlin.android)
   alias(libs.plugins.kotlin.compose)
   alias(libs.plugins.ksp)
   alias(libs.plugins.sentry) apply false
   alias(libs.plugins.sqldelight)
-  id("io.sentry.spotless")
-  id("io.sentry.jdk-target")
 }
 
+val sentryVersion = libs.versions.sentry.get()
+
 if (providers.gradleProperty("useSagp").isPresent) {
   apply(plugin = "io.sentry.android.gradle")
 }
@@ -54,7 +57,7 @@ android {
     minSdk = 23
     targetSdk = libs.versions.targetSdk.get().toInt()
     versionCode = 2
-    versionName = project.version.toString()
+    versionName = sentryVersion
 
     externalNativeBuild {
       cmake {
@@ -66,7 +69,7 @@ android {
       }
     }
 
-    ndk { abiFilters.addAll(Config.Android.abiFilters) }
+    ndk { abiFilters.addAll(listOf("x86", "armeabi-v7a", "x86_64", "arm64-v8a")) }
   }
 
   lint {
@@ -105,7 +108,7 @@ android {
 
   signingConfigs {
     getByName("debug") {
-      storeFile = rootProject.file("debug.keystore")
+      storeFile = file("../../debug.keystore")
       storePassword = "android"
       keyAlias = "androiddebugkey"
       keyPassword = "android"
@@ -147,7 +150,7 @@ android {
     val toggleNativeLoggingTask =
       project.tasks.register<ToggleNativeLoggingTask>(taskName) {
         mergedManifest.set(variant.artifacts.get(SingleArtifact.MERGED_MANIFEST))
-        rootDir.set(project.rootDir.absolutePath)
+        repoDir.set(layout.projectDirectory.dir("../..").asFile.canonicalPath)
       }
     project.afterEvaluate {
       (variant as? VariantImpl<*>)?.taskContainer?.assembleTask?.configure {
@@ -174,23 +177,21 @@ sqldelight {
 }
 
 dependencies {
-  implementation(
-    kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
-  )
-
-  implementation(projects.sentryAndroid)
-  implementation(projects.sentryAndroidFragment)
-  implementation(projects.sentryAndroidNavigation)
-  implementation(projects.sentryAndroidNavigation3)
-  implementation(projects.sentryAndroidSqlite)
-  implementation(projects.sentryAndroidTimber)
-  implementation(projects.sentryCompose)
-  implementation(projects.sentryKotlinExtensions)
-  implementation(projects.sentryOkhttp)
-  implementation(projects.sentrySpotlight)
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
+
+  implementation("io.sentry:sentry-android:$sentryVersion")
+  implementation("io.sentry:sentry-android-fragment:$sentryVersion")
+  implementation("io.sentry:sentry-android-navigation:$sentryVersion")
+  implementation("io.sentry:sentry-android-navigation3:$sentryVersion")
+  implementation("io.sentry:sentry-android-sqlite:$sentryVersion")
+  implementation("io.sentry:sentry-android-timber:$sentryVersion")
+  implementation("io.sentry:sentry-compose:$sentryVersion")
+  implementation("io.sentry:sentry-kotlin-extensions:$sentryVersion")
+  implementation("io.sentry:sentry-okhttp:$sentryVersion")
+  implementation("io.sentry:sentry-spotlight:$sentryVersion")
 
   //    how to exclude androidx if release health feature is disabled
-  //    implementation(projects.sentryAndroid) {
+  //    implementation("io.sentry:sentry-android:$sentryVersion") {
   //        exclude(group = "androidx.lifecycle", module = "lifecycle-process")
   //        exclude(group = "androidx.lifecycle", module = "lifecycle-common-java8")
   //        exclude(group = "androidx.core", module = "core")
@@ -231,7 +232,7 @@ dependencies {
   ksp(libs.androidx.room.compiler)
   ksp(libs.androidx.room3.compiler)
 
-  debugImplementation(projects.sentryAndroidDistribution)
+  debugImplementation("io.sentry:sentry-android-distribution:$sentryVersion")
   debugImplementation(libs.leakcanary)
 
   testImplementation(libs.google.truth)
@@ -239,7 +240,7 @@ dependencies {
 }
 
 abstract class ToggleNativeLoggingTask : Exec() {
-  @get:Input abstract val rootDir: Property<String>
+  @get:Input abstract val repoDir: Property<String>
 
   @get:InputFile abstract val mergedManifest: RegularFileProperty
 
@@ -257,7 +258,7 @@ abstract class ToggleNativeLoggingTask : Exec() {
           args.add(0, "cmd")
           args.add(1, "/c")
         }
-        args.add("${rootDir.get()}/scripts/toggle-codec-logs.sh")
+        args.add("${repoDir.get()}/scripts/toggle-codec-logs.sh")
         args.add(if (value) "enable" else "disable")
         commandLine(args)
         super.exec()
diff --git a/sentry-samples/sentry-samples-android/gradle.properties b/sentry-samples/sentry-samples-android/gradle.properties
new file mode 120000
index 00000000000..03ca90c515b
--- /dev/null
+++ b/sentry-samples/sentry-samples-android/gradle.properties
@@ -0,0 +1 @@
+../../gradle.properties
\ No newline at end of file
diff --git a/sentry-samples/sentry-samples-android/gradle/gradle-daemon-jvm.properties b/sentry-samples/sentry-samples-android/gradle/gradle-daemon-jvm.properties
new file mode 120000
index 00000000000..b6233ee4449
--- /dev/null
+++ b/sentry-samples/sentry-samples-android/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1 @@
+../../../gradle/gradle-daemon-jvm.properties
\ No newline at end of file
diff --git a/sentry-samples/sentry-samples-android/gradle/wrapper b/sentry-samples/sentry-samples-android/gradle/wrapper
new file mode 120000
index 00000000000..166ffc09a82
--- /dev/null
+++ b/sentry-samples/sentry-samples-android/gradle/wrapper
@@ -0,0 +1 @@
+../../../gradle/wrapper
\ No newline at end of file
diff --git a/sentry-samples/sentry-samples-android/gradlew b/sentry-samples/sentry-samples-android/gradlew
new file mode 120000
index 00000000000..343e0d2caa4
--- /dev/null
+++ b/sentry-samples/sentry-samples-android/gradlew
@@ -0,0 +1 @@
+../../gradlew
\ No newline at end of file
diff --git a/sentry-android-integration-tests/sentry-uitest-android-macrobenchmark/README.md b/sentry-samples/sentry-samples-android/macrobenchmark/README.md
similarity index 97%
rename from sentry-android-integration-tests/sentry-uitest-android-macrobenchmark/README.md
rename to sentry-samples/sentry-samples-android/macrobenchmark/README.md
index 9914825584d..23c5fab6921 100644
--- a/sentry-android-integration-tests/sentry-uitest-android-macrobenchmark/README.md
+++ b/sentry-samples/sentry-samples-android/macrobenchmark/README.md
@@ -1,4 +1,4 @@
-# sentry-uitest-android-macrobenchmark
+# macrobenchmark
 
 Jetpack Macrobenchmark for cold-start of `sentry-samples-android`, used to evaluate SDK-init
 performance changes on a real device in a **stable, reproducible** way. Not run in CI.
@@ -28,7 +28,7 @@ unlocked-clock device after ~14 iterations, inflating the tail of longer runs.
 Connect a device, then:
 
 ```bash
-./gradlew :sentry-android-integration-tests:sentry-uitest-android-macrobenchmark:connectedBenchmarkAndroidTest
+./gradlew -p sentry-samples/sentry-samples-android :macrobenchmark:connectedBenchmarkAndroidTest
 ```
 
 Results print to the console and are written to
diff --git a/sentry-android-integration-tests/sentry-uitest-android-macrobenchmark/build.gradle.kts b/sentry-samples/sentry-samples-android/macrobenchmark/build.gradle.kts
similarity index 95%
rename from sentry-android-integration-tests/sentry-uitest-android-macrobenchmark/build.gradle.kts
rename to sentry-samples/sentry-samples-android/macrobenchmark/build.gradle.kts
index 12da53b7721..a26fe088cd7 100644
--- a/sentry-android-integration-tests/sentry-uitest-android-macrobenchmark/build.gradle.kts
+++ b/sentry-samples/sentry-samples-android/macrobenchmark/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
   id("com.android.test")
-  alias(libs.plugins.kotlin.android)
   id("io.sentry.spotless")
   id("io.sentry.jdk-target")
+  alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -28,7 +28,7 @@ android {
     }
   }
 
-  targetProjectPath = ":sentry-samples:sentry-samples-android"
+  targetProjectPath = ":"
   // Run the test in its own process so it measures the target app cold, not itself.
   experimentalProperties["android.experimental.self-instrumenting"] = true
 }
diff --git a/sentry-android-integration-tests/sentry-uitest-android-macrobenchmark/src/main/AndroidManifest.xml b/sentry-samples/sentry-samples-android/macrobenchmark/src/main/AndroidManifest.xml
similarity index 100%
rename from sentry-android-integration-tests/sentry-uitest-android-macrobenchmark/src/main/AndroidManifest.xml
rename to sentry-samples/sentry-samples-android/macrobenchmark/src/main/AndroidManifest.xml
diff --git a/sentry-android-integration-tests/sentry-uitest-android-macrobenchmark/src/main/java/io/sentry/uitest/android/macrobenchmark/SentryStartupBenchmark.kt b/sentry-samples/sentry-samples-android/macrobenchmark/src/main/java/io/sentry/uitest/android/macrobenchmark/SentryStartupBenchmark.kt
similarity index 100%
rename from sentry-android-integration-tests/sentry-uitest-android-macrobenchmark/src/main/java/io/sentry/uitest/android/macrobenchmark/SentryStartupBenchmark.kt
rename to sentry-samples/sentry-samples-android/macrobenchmark/src/main/java/io/sentry/uitest/android/macrobenchmark/SentryStartupBenchmark.kt
diff --git a/sentry-samples/sentry-samples-android/settings.gradle.kts b/sentry-samples/sentry-samples-android/settings.gradle.kts
new file mode 100644
index 00000000000..9d024bf958a
--- /dev/null
+++ b/sentry-samples/sentry-samples-android/settings.gradle.kts
@@ -0,0 +1,64 @@
+pluginManagement {
+  repositories {
+    // Prefer local SAGP artifact if one exists; otherwise fall back to libs.versions.toml.
+    if (providers.gradleProperty("useSagp").isPresent) {
+      mavenLocal {
+        content {
+          includeGroup("io.sentry")
+          includeGroup("io.sentry.android.gradle")
+        }
+      }
+    }
+    mavenCentral()
+    gradlePluginPortal()
+    google()
+  }
+
+  // Every build in a composite must use the same AGP, so each build's settings applies the AGP
+  // matrix job's override.
+  System.getenv("VERSION_AGP")?.let { agpVersion ->
+    resolutionStrategy {
+      eachPlugin {
+        if (requested.id.id.startsWith("com.android")) {
+          useVersion(agpVersion)
+        }
+      }
+    }
+  }
+}
+
+plugins {
+  id("com.gradle.develocity") version "4.6.1"
+  id("com.gradle.common-custom-user-data-gradle-plugin") version "2.8.0"
+}
+
+develocity {
+  buildScan {
+    termsOfUseUrl.set("https://gradle.com/help/legal-terms-of-use")
+    termsOfUseAgree.set("yes")
+  }
+}
+
+dependencyResolutionManagement {
+  repositories {
+    google()
+    mavenCentral()
+    mavenLocal()
+  }
+  versionCatalogs {
+    create("libs") {
+      from(files("../../gradle/libs.versions.toml"))
+      // gradle.properties links to the SDK build's, so versionName is the SDK version.
+      version("sentry", providers.gradleProperty("versionName").get())
+    }
+  }
+}
+
+rootProject.name = "sentry-samples-android"
+
+includeBuild("../..")
+
+// For the io.sentry.spotless and io.sentry.jdk-target convention plugins.
+includeBuild("../../build-logic")
+
+include("macrobenchmark")
diff --git a/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts b/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts
index f4cce527834..f64c52f2d00 100644
--- a/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts
+++ b/sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts
@@ -1,4 +1,5 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import io.sentry.gradle.MergeSpringMetadataAction
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -24,8 +25,8 @@ java.targetCompatibility = JavaVersion.VERSION_1_8
 dependencies {
   implementation(platform(libs.springboot2.bom))
   implementation(libs.springboot.starter.web)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpringBootStarter)
   implementation(projects.sentryGraphql)
   implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:4.9.2"))
diff --git a/sentry-samples/sentry-samples-spring-7/build.gradle.kts b/sentry-samples/sentry-samples-spring-7/build.gradle.kts
index 744cb76b1c5..c9825bda212 100644
--- a/sentry-samples/sentry-samples-spring-7/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring-7/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.springframework.boot.gradle.plugin.SpringBootPlugin
 
@@ -31,13 +31,13 @@ dependencyManagement {
 }
 
 dependencies {
-  implementation(Config.Libs.springWeb)
-  implementation(Config.Libs.springAop)
-  implementation(Config.Libs.aspectj)
-  implementation(Config.Libs.springSecurityWeb)
-  implementation(Config.Libs.springSecurityConfig)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.springframework:spring-webmvc")
+  implementation("org.springframework:spring-aop")
+  implementation("org.aspectj:aspectjweaver")
+  implementation("org.springframework.security:spring-security-web")
+  implementation("org.springframework.security:spring-security-config")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpring7)
   implementation(projects.sentryLogback)
   implementation(projects.sentryAsyncProfiler)
diff --git a/sentry-samples/sentry-samples-spring-boot-4-log4j2/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-log4j2/build.gradle.kts
index af5446277a2..eab14e55247 100644
--- a/sentry-samples/sentry-samples-spring-boot-4-log4j2/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring-boot-4-log4j2/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -38,9 +38,9 @@ dependencies {
   implementation(libs.springboot4.starter.websocket)
   implementation(libs.springboot4.starter.restclient)
   implementation(libs.springboot4.starter.webclient)
-  implementation(Config.Libs.aspectj)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.aspectj:aspectjweaver")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpringBoot4Starter)
   implementation(projects.sentryGraphql22)
   implementation(projects.sentryQuartz)
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts
index e6f088e7ff3..0f3479ee6b1 100644
--- a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -38,9 +38,9 @@ dependencies {
   implementation(libs.springboot4.starter.websocket)
   implementation(libs.springboot4.starter.webclient)
   implementation(libs.springboot4.starter.restclient)
-  implementation(Config.Libs.aspectj)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.aspectj:aspectjweaver")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpringBoot4Starter)
   implementation(projects.sentryLogback)
   implementation(projects.sentryGraphql22)
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts
index f878d37b51a..7b92e24a462 100644
--- a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.springframework.boot.gradle.tasks.run.BootRun
 
@@ -39,9 +39,9 @@ dependencies {
   implementation(libs.springboot4.starter.websocket)
   implementation(libs.springboot4.starter.webclient)
   implementation(libs.springboot4.starter.restclient)
-  implementation(Config.Libs.aspectj)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.aspectj:aspectjweaver")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpringBoot4Starter)
   implementation(projects.sentryLogback)
   implementation(projects.sentryGraphql22)
diff --git a/sentry-samples/sentry-samples-spring-boot-4-otlp/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-otlp/build.gradle.kts
index 4d16f23e893..88f82666c5d 100644
--- a/sentry-samples/sentry-samples-spring-boot-4-otlp/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring-boot-4-otlp/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -38,9 +38,9 @@ dependencies {
   implementation(libs.springboot4.starter.websocket)
   implementation(libs.springboot4.starter.restclient)
   implementation(libs.springboot4.starter.webclient)
-  implementation(Config.Libs.aspectj)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.aspectj:aspectjweaver")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpringBoot4Starter)
   implementation(projects.sentryLogback)
   implementation(projects.sentryGraphql22)
diff --git a/sentry-samples/sentry-samples-spring-boot-4-webflux/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4-webflux/build.gradle.kts
index 39f8b0487a2..942b70d491d 100644
--- a/sentry-samples/sentry-samples-spring-boot-4-webflux/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring-boot-4-webflux/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -15,8 +15,8 @@ group = "io.sentry.sample.spring-boot-4-webflux"
 version = "0.0.1-SNAPSHOT"
 
 dependencies {
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpringBoot4Starter)
   implementation(projects.sentryLogback)
   implementation(projects.sentryJdbc)
diff --git a/sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts
index ac2f15e32fa..2059633409f 100644
--- a/sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring-boot-4/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -38,9 +38,9 @@ dependencies {
   implementation(libs.springboot4.starter.websocket)
   implementation(libs.springboot4.starter.restclient)
   implementation(libs.springboot4.starter.webclient)
-  implementation(Config.Libs.aspectj)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.aspectj:aspectjweaver")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpringBoot4Starter)
   implementation(projects.sentryLogback)
   implementation(projects.sentryGraphql22)
diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-log4j2/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-log4j2/build.gradle.kts
index dd8e2fcaa83..0c57e1259f1 100644
--- a/sentry-samples/sentry-samples-spring-boot-jakarta-log4j2/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring-boot-jakarta-log4j2/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -40,9 +40,9 @@ dependencies {
   implementation(libs.springboot3.starter.web)
   implementation(libs.springboot3.starter.webflux)
   implementation(libs.springboot3.starter.websocket)
-  implementation(Config.Libs.aspectj)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.aspectj:aspectjweaver")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpringBootStarterJakarta)
   implementation(projects.sentryLog4j2)
   implementation("org.springframework.boot:spring-boot-starter-log4j2")
diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts
index d442c49dae6..757bbda8fb1 100644
--- a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -41,9 +41,9 @@ dependencies {
   implementation(libs.springboot3.starter.web)
   implementation(libs.springboot3.starter.webflux)
   implementation(libs.springboot3.starter.websocket)
-  implementation(Config.Libs.aspectj)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.aspectj:aspectjweaver")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpringBootStarterJakarta)
   implementation(projects.sentryLogback)
   implementation(projects.sentryGraphql22)
diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts
index 847ae9ef888..9e6201fd6a1 100644
--- a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.springframework.boot.gradle.tasks.run.BootRun
 
@@ -41,9 +41,9 @@ dependencies {
   implementation(libs.springboot3.starter.web)
   implementation(libs.springboot3.starter.webflux)
   implementation(libs.springboot3.starter.websocket)
-  implementation(Config.Libs.aspectj)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.aspectj:aspectjweaver")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpringBootStarterJakarta)
   implementation(projects.sentryLogback)
   implementation(projects.sentryGraphql22)
diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts
index de238c334c9..63f9b1799b8 100644
--- a/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -40,9 +40,9 @@ dependencies {
   implementation(libs.springboot3.starter.web)
   implementation(libs.springboot3.starter.webflux)
   implementation(libs.springboot3.starter.websocket)
-  implementation(Config.Libs.aspectj)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.aspectj:aspectjweaver")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpringBootStarterJakarta)
   implementation(projects.sentryLogback)
   implementation(projects.sentryGraphql22)
diff --git a/sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts
index e3b3440404b..fafda035855 100644
--- a/sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts
@@ -1,4 +1,5 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import io.sentry.gradle.MergeSpringMetadataAction
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -46,9 +47,9 @@ dependencies {
   implementation(libs.springboot.starter.web)
   implementation(libs.springboot.starter.webflux)
   implementation(libs.springboot.starter.websocket)
-  implementation(Config.Libs.aspectj)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.aspectj:aspectjweaver")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpringBootStarter)
   implementation(projects.sentryLogback)
   implementation(projects.sentryGraphql)
diff --git a/sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts
index cd31246dd2c..5e5ceb5eafd 100644
--- a/sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts
@@ -1,4 +1,5 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import io.sentry.gradle.MergeSpringMetadataAction
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -45,9 +46,9 @@ dependencies {
   implementation(libs.springboot.starter.web)
   implementation(libs.springboot.starter.webflux)
   implementation(libs.springboot.starter.websocket)
-  implementation(Config.Libs.aspectj)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.aspectj:aspectjweaver")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpringBootStarter)
   implementation(projects.sentryLogback)
   implementation(projects.sentryGraphql)
diff --git a/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts
index cbf037a36a1..eba13d006fd 100644
--- a/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring-boot-webflux-jakarta/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -24,8 +24,8 @@ dependencyManagement {
 extra["kotlin-coroutines.version"] = "1.9.0"
 
 dependencies {
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpringBootStarterJakarta)
   implementation(projects.sentryLogback)
   implementation(projects.sentryJdbc)
diff --git a/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts
index 34cb09077f7..2726fdb076c 100644
--- a/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts
@@ -1,4 +1,5 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import io.sentry.gradle.MergeSpringMetadataAction
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -32,8 +33,8 @@ dependencies {
   implementation(libs.springboot.starter.actuator)
   implementation(libs.springboot.starter.graphql)
   implementation(libs.springboot.starter.webflux)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpringBootStarter)
   implementation(projects.sentryLogback)
   implementation(projects.sentryGraphql)
diff --git a/sentry-samples/sentry-samples-spring-boot/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot/build.gradle.kts
index 4737e6b8874..f1c71766f57 100644
--- a/sentry-samples/sentry-samples-spring-boot/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring-boot/build.gradle.kts
@@ -1,4 +1,5 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
+import io.sentry.gradle.MergeSpringMetadataAction
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -50,9 +51,9 @@ dependencies {
 
   implementation(libs.spring.kafka2)
   implementation(projects.sentryKafka)
-  implementation(Config.Libs.aspectj)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation("org.aspectj:aspectjweaver")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8", getKotlinPluginVersion()))
   implementation(projects.sentrySpringBootStarter)
   implementation(projects.sentryLogback)
   implementation(projects.sentryGraphql)
diff --git a/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts
index ccb1b24f3f8..d189bec4c84 100644
--- a/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts
@@ -29,13 +29,13 @@ dependencyManagement {
 }
 
 dependencies {
-  implementation(Config.Libs.springWeb)
-  implementation(Config.Libs.springAop)
-  implementation(Config.Libs.aspectj)
-  implementation(Config.Libs.springSecurityWeb)
-  implementation(Config.Libs.springSecurityConfig)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib))
+  implementation("org.springframework:spring-webmvc")
+  implementation("org.springframework:spring-aop")
+  implementation("org.aspectj:aspectjweaver")
+  implementation("org.springframework.security:spring-security-web")
+  implementation("org.springframework.security:spring-security-config")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8"))
   implementation(projects.sentrySpringJakarta)
   implementation(projects.sentryLogback)
   implementation(projects.sentryAsyncProfiler)
diff --git a/sentry-samples/sentry-samples-spring/build.gradle.kts b/sentry-samples/sentry-samples-spring/build.gradle.kts
index 7666a81cfab..4ef973725e9 100644
--- a/sentry-samples/sentry-samples-spring/build.gradle.kts
+++ b/sentry-samples/sentry-samples-spring/build.gradle.kts
@@ -40,13 +40,13 @@ dependencyManagement {
 }
 
 dependencies {
-  implementation(Config.Libs.springWeb)
-  implementation(Config.Libs.springAop)
-  implementation(Config.Libs.aspectj)
-  implementation(Config.Libs.springSecurityWeb)
-  implementation(Config.Libs.springSecurityConfig)
-  implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib))
+  implementation("org.springframework:spring-webmvc")
+  implementation("org.springframework:spring-aop")
+  implementation("org.aspectj:aspectjweaver")
+  implementation("org.springframework.security:spring-security-web")
+  implementation("org.springframework.security:spring-security-config")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation(kotlin("stdlib-jdk8"))
   implementation(projects.sentrySpring)
   implementation(projects.sentryLogback)
   implementation(projects.sentryAsyncProfiler)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ec94cc6ccdf..aae18edb922 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -2,19 +2,22 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 pluginManagement {
   repositories {
-    // Prefer local SAGP artifact if one exists; otherwise fall back to libs.versions.toml.
-    if (providers.gradleProperty("useSagp").isPresent) {
-      mavenLocal {
-        content {
-          includeGroup("io.sentry")
-          includeGroup("io.sentry.android.gradle")
-        }
-      }
-    }
     mavenCentral()
     gradlePluginPortal()
     google()
   }
+
+  // Every build in a composite must use the same AGP, so each build's settings applies the AGP
+  // matrix job's override.
+  System.getenv("VERSION_AGP")?.let { agpVersion ->
+    resolutionStrategy {
+      eachPlugin {
+        if (requested.id.id.startsWith("com.android")) {
+          useVersion(agpVersion)
+        }
+      }
+    }
+  }
 }
 
 plugins {
@@ -100,7 +103,6 @@ include(
     "sentry-reactor",
     "sentry-async-profiler",
     "sentry-ktor-client",
-    "sentry-samples:sentry-samples-android",
     "sentry-samples:sentry-samples-console",
     "sentry-samples:sentry-samples-console-otlp",
     "sentry-samples:sentry-samples-console-opentelemetry-noagent",
@@ -128,9 +130,5 @@ include(
     "sentry-samples:sentry-samples-spring-boot-4-otlp",
     "sentry-samples:sentry-samples-spring-boot-4-webflux",
     "sentry-samples:sentry-samples-netflix-dgs",
-    "sentry-android-integration-tests:sentry-uitest-android-critical",
-    "sentry-android-integration-tests:sentry-uitest-android-macrobenchmark",
-    "sentry-android-integration-tests:sentry-uitest-android",
-    "sentry-android-integration-tests:test-app-size",
     "sentry-samples:sentry-samples-openfeign"
 )