ref(build): Consolidate sentry-java version into version catalog (#1245)

* ref(build): Consolidate sentry-java version into version catalog

The sentry SDK version was declared twice: once in libs.versions.toml
(7.0.0, used for the plugin's own compile dependency) and once in
gradle.properties as sdk_version (8.43.0, used as BuildConfig.SdkVersion
for auto-installation defaults and telemetry). Consolidate into a single
source of truth in libs.versions.toml and read it via libs.versions.sentry
in build.gradle.kts.

Dependabot (gradle package ecosystem, directory "/") now handles updates
to the sentry version via libs.versions.toml, making the custom
getsentry/github-workflows/updater job and scripts/update-android.sh
redundant.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* ref(build): Consolidate sentry-java version into version catalog

The sentry SDK version was declared twice: once in libs.versions.toml
(7.0.0, used for the plugin's own compile dependency) and once in
gradle.properties as sdk_version (8.43.0, used as BuildConfig.SdkVersion
for auto-installation defaults and telemetry). Consolidate into a single
source of truth in libs.versions.toml and read it via libs.versions.sentry
in build.gradle.kts.

Update scripts/update-android.sh to read/write the version from
libs.versions.toml instead of gradle.properties.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix(build): Replace removed sentry-android-okhttp with sentry-okhttp

sentry-android-okhttp was removed in sentry-java 8.0.0 and replaced by
sentry-okhttp, which is a plain java-library (JAR) rather than an AAR.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix(build): Fix update-android.sh regex to match full version string

[0-9\.]+ stops at the first non-numeric character, so when the current
version in libs.versions.toml has a prerelease suffix (e.g. 9.0.0-RC1),
set-version only matches the numeric prefix and leaves the suffix in
place, producing corrupt entries like sentry = "9.1.0-RC1".

Switch to [^"]+ so the entire value up to the closing quote is captured
and replaced in one shot.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* test(instrumentation): Stub removed sentry-android-okhttp event listener

VisitorTest verifies instrumented bytecode against the real classes on
the test classpath. After bumping sentry to 8.43.0, the test classpath
provides sentry-okhttp instead of sentry-android-okhttp, so
io.sentry.android.okhttp.SentryOkHttpEventListener no longer resolves.
The classloader then generated an empty stub extending Object, which is
not an okhttp3.EventListener subtype, so the eventListener() call in the
legacy useSentryAndroidOkHttp path failed bytecode verification.

Generate a stub for it that extends io.sentry.okhttp.SentryOkHttpEventListener,
mirroring the real inheritance so the verifier accepts the call.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* test(build): Drop redundant AAR dependency on sentry-okhttp

sentry-okhttp is a plain JVM library, so pulling it through the
testImplementationAar (.aar -> .jar) configuration is unnecessary; the
testImplementation entry already provides it on the test classpath.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* test(instrumentation): Pin sentry-android-okhttp for legacy okhttp test

Verify the legacy useSentryAndroidOkHttp instrumentation path against the
real io.sentry.android.okhttp.SentryOkHttpEventListener instead of a
hand-written stub. The module was removed from the SDK in 8.0.0, so pin
the test dependency to 7.22.6, its last release. No updater can bump it
since no newer version of the artifact exists.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: runningcode

gradle/libs.versions.toml

@@ -5,7 +5,11 @@ agp = "8.10.1"
 asm = "9.4" # // compatibility matrix -> https://developer.android.com/reference/tools/gradle-api/7.1/com/android/build/api/instrumentation/InstrumentationContext#apiversion
 ktfmt = "0.51"
 sqlite = "2.1.0"
-sentry = "7.0.0"
+sentry = "8.43.0"
+# Pinned to the last release that shipped sentry-android-okhttp; the module was removed
+# in 8.0.0, so there is no newer version to update to. Used only to verify the legacy
+# okhttp instrumentation path in tests.
+sentryAndroidOkhttp = "7.22.6"
 
 sampleCoroutines = "1.5.2"
 sampleRoom = "2.7.2"
@@ -51,8 +55,8 @@ sqlite = { group = "androidx.sqlite", name = "sqlite", version.ref = "sqlite" }
 sqliteFramework = { group = "androidx.sqlite", name = "sqlite-framework", version.ref = "sqlite" }
 sentry = { group = "io.sentry", name = "sentry", version.ref = "sentry" }
 sentryAndroid = { group = "io.sentry", name = "sentry-android", version.ref = "sentry" }
-sentryAndroidOkhttp = { group = "io.sentry", name = "sentry-android-okhttp", version.ref = "sentry" }
 sentryOkhttp = { group = "io.sentry", name = "sentry-okhttp", version.ref = "sentry" }
+sentryAndroidOkhttp = { group = "io.sentry", name = "sentry-android-okhttp", version.ref = "sentryAndroidOkhttp" }
 sentrySpringBootJakarta = { group = "io.sentry", name = "sentry-spring-boot-starter-jakarta", version.ref = "sentry" }
 
 # test

plugin-build/build.gradle.kts

@@ -59,8 +59,8 @@ dependencies {
   testImplementationAar(libs.sqliteFramework)
   testRuntimeOnly(files(androidSdkPath))
   testImplementationAar(libs.sentryAndroid)
+  testImplementation(libs.sentryOkhttp)
   testImplementationAar(libs.sentryAndroidOkhttp)
-  testImplementationAar(libs.sentryOkhttp)
 
   // Needed to read contents from APK/Source Bundles
   testImplementation(libs.arscLib)
@@ -322,7 +322,7 @@ buildConfig {
   className("BuildConfig")
 
   buildConfigField("String", "Version", provider { "\"${project.version}\"" })
-  buildConfigField("String", "SdkVersion", provider { "\"${project.property("sdk_version")}\"" })
+  buildConfigField("String", "SdkVersion", libs.versions.sentry.map { "\"$it\"" })
   buildConfigField("String", "AgpVersion", provider { "\"${BuildPluginsVersion.AGP}\"" })
   buildConfigField("String", "CliVersion", propertyVersionProvider("sentry-cli.properties"))
   buildConfigField(

plugin-build/gradle.properties

@@ -8,7 +8,6 @@ org.gradle.parallel=true
 name = sentry-android-gradle-plugin
 group = io.sentry
 version = 6.9.0
-sdk_version = 8.43.0
 
 # publication pom properties
 POM_NAME=Sentry Android Gradle Plugin

scripts/update-android.sh

@@ -2,10 +2,10 @@
 set -euo pipefail
 
 cd $(dirname "$0")/../
-file='plugin-build/gradle.properties'
+file='gradle/libs.versions.toml'
 content=$(cat $file)
 
-regex='(sdk_version = *)([0-9\.]+)'
+regex='(sentry = ")([^"]+)'
 if ! [[ $content =~ $regex ]]; then
     echo "Failed to find the Android SDK version in $file"
     exit 1