From a217d06af9ffd856a1dac2268f4b8e68a498726d Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Fri, 22 May 2026 13:56:18 +0200 Subject: [PATCH 1/2] fix: Remove AGP 7.x R8 workaround AGP 7.x is no longer in the CI matrix and the default AGP version is 8.10.1. The conditional R8 classpath override is dead code. Co-Authored-By: Claude Opus 4.6 --- build.gradle.kts | 5 ----- .../android/gradle/integration/BaseSentryPluginTest.kt | 5 ----- 2 files changed, 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index dd9baa33d..750d867b3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,5 @@ buildscript { dependencies { classpath("org.apache.commons:commons-compress:1.28.0") } - if (BuildPluginsVersion.AGP.substringBefore(".").toInt() < 8) { - // AGP 7.x has troubles with compileSdk 34 due to some R8 shenanigans, so we have to use a newer - // version of R* here - dependencies { classpath("com.android.tools:r8:8.11.18") } - } } plugins { diff --git a/plugin-build/src/test/kotlin/io/sentry/android/gradle/integration/BaseSentryPluginTest.kt b/plugin-build/src/test/kotlin/io/sentry/android/gradle/integration/BaseSentryPluginTest.kt index 5aae46f01..9557fcadb 100644 --- a/plugin-build/src/test/kotlin/io/sentry/android/gradle/integration/BaseSentryPluginTest.kt +++ b/plugin-build/src/test/kotlin/io/sentry/android/gradle/integration/BaseSentryPluginTest.kt @@ -74,11 +74,6 @@ abstract class BaseSentryPluginTest( // withPluginClasspath on the Gradle Runner. $additionalBuildClasspath classpath files($pluginClasspath) - if ("$androidGradlePluginVersion".split('\\.')[0].toInteger() < 8) { - // AGP 7.x has troubles with compileSdk 34 due to some R8 shenanigans, so we have to use a newer - // version of R* here - classpath 'com.android.tools:r8:8.11.18' - } } } From f5b80a8923f8bad989e203a827b2606fe062f558 Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Fri, 22 May 2026 14:03:04 +0200 Subject: [PATCH 2/2] chore: Apply spotless formatting Co-Authored-By: Claude Opus 4.6 --- build.gradle.kts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 750d867b3..afbb166d8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,4 @@ -buildscript { - dependencies { classpath("org.apache.commons:commons-compress:1.28.0") } -} +buildscript { dependencies { classpath("org.apache.commons:commons-compress:1.28.0") } } plugins { alias(libs.plugins.kotlin) version BuildPluginsVersion.KOTLIN apply false