Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
runningcode wants to merge 6 commits into
base: main
Choose a base branch
from
+11 −8
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91a36c2
ref(build): Consolidate sentry-java version into version catalog
runningcode Jun 1, 2026
30df376
ref(build): Consolidate sentry-java version into version catalog
runningcode Jun 1, 2026
7e7d84b
fix(build): Replace removed sentry-android-okhttp with sentry-okhttp
runningcode Jun 1, 2026
b901140
fix(build): Fix update-android.sh regex to match full version string
runningcode Jun 1, 2026
afdf31a
test(instrumentation): Stub removed sentry-android-okhttp event listener
runningcode Jun 1, 2026
8251bf6
test(build): Drop redundant AAR dependency on sentry-okhttp
runningcode Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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"
Copy link
Copy Markdown
Contributor Author

@runningcode runningcode Jun 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm wondering why dependabot never updated this.

sentry = "8.43.0"
Copy link
Copy Markdown
Member

@romtsn romtsn Jun 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

potentially bumping this all the time would require us adapting SentryTelemetryService, but that's probably a good thing


sampleCoroutines = "1.5.2"
sampleRoom = "2.7.2"
Expand Down Expand Up @@ -51,7 +51,6 @@ 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" }
Copy link
Copy Markdown
Member

@romtsn romtsn Jun 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could we still keep it at a fixed version and drop that codepath (and the dep) in the next major of the plugin altogether?

sentryOkhttp = { group = "io.sentry", name = "sentry-okhttp", version.ref = "sentry" }
sentrySpringBootJakarta = { group = "io.sentry", name = "sentry-spring-boot-starter-jakarta", version.ref = "sentry" }

Expand Down
5 changes: 2 additions & 3 deletions plugin-build/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ dependencies {
testImplementationAar(libs.sqliteFramework)
testRuntimeOnly(files(androidSdkPath))
testImplementationAar(libs.sentryAndroid)
testImplementationAar(libs.sentryAndroidOkhttp)
testImplementationAar(libs.sentryOkhttp)
testImplementation(libs.sentryOkhttp)

// Needed to read contents from APK/Source Bundles
testImplementation(libs.arscLib)
Expand Down Expand Up @@ -322,7 +321,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(
Expand Down
1 change: 0 additions & 1 deletion plugin-build/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions ...test/kotlin/io/sentry/android/gradle/instrumentation/classloader/mapping/OkHttpMapping.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,10 @@ val okHttpMissingClasses =
{ name ->
standardClassSource(name, superclass = "okhttp3.internal.Internal")
},
// Removed from the Sentry SDK in 8.0.0; generate a stub so the verifier can still
// resolve it for the legacy useSentryAndroidOkHttp instrumentation path.
"io.sentry.android.okhttp.SentryOkHttpEventListener" to
{ name ->
standardClassSource(name, superclass = "io.sentry.okhttp.SentryOkHttpEventListener")
},
)
4 changes: 2 additions & 2 deletions scripts/update-android.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
set -euo pipefail

cd $(dirname "$0")/../
file='plugin-build/gradle.properties'
file='gradle/libs.versions.toml'
Copy link
Copy Markdown
Contributor Author

@runningcode runningcode Jun 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a feeling that there is a bug here with dependabot and included builds and libs.versions.toml files since this was never updated. So let's keep the custom updater script but it will update a single source of truth now.

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
Expand Down
Loading