diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b65dd7052..a89d29206 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" +sentry = "8.43.0" sampleCoroutines = "1.5.2" sampleRoom = "2.7.2" @@ -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" } sentryOkhttp = { group = "io.sentry", name = "sentry-okhttp", version.ref = "sentry" } sentrySpringBootJakarta = { group = "io.sentry", name = "sentry-spring-boot-starter-jakarta", version.ref = "sentry" } diff --git a/plugin-build/build.gradle.kts b/plugin-build/build.gradle.kts index 842144260..91a7bcb58 100644 --- a/plugin-build/build.gradle.kts +++ b/plugin-build/build.gradle.kts @@ -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) @@ -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( diff --git a/plugin-build/gradle.properties b/plugin-build/gradle.properties index f5a0dafc7..5a088b400 100644 --- a/plugin-build/gradle.properties +++ b/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 diff --git a/plugin-build/src/test/kotlin/io/sentry/android/gradle/instrumentation/classloader/mapping/OkHttpMapping.kt b/plugin-build/src/test/kotlin/io/sentry/android/gradle/instrumentation/classloader/mapping/OkHttpMapping.kt index 5bfcafb37..ecd5220a4 100644 --- a/plugin-build/src/test/kotlin/io/sentry/android/gradle/instrumentation/classloader/mapping/OkHttpMapping.kt +++ b/plugin-build/src/test/kotlin/io/sentry/android/gradle/instrumentation/classloader/mapping/OkHttpMapping.kt @@ -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") + }, ) diff --git a/scripts/update-android.sh b/scripts/update-android.sh index 4981f2fa7..614e67d8d 100755 --- a/scripts/update-android.sh +++ b/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