diff --git a/CHANGELOG.md b/CHANGELOG.md index d841fa4d866..50e013db548 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ - Make `ISpan.startChild` overloads with `SpanOptions` public ([#5927](https://github.com/getsentry/sentry-java/pull/5927)) +### Improvements + +- Remove `ApiStatus.Experimental` annotation from `SentrySQLiteDriver` ([#5938](https://github.com/getsentry/sentry-java/pull/5938)) + ### Fixes - Clear contexts when calling `Scope.clear()` ([#5902](https://github.com/getsentry/sentry-java/pull/5902)) diff --git a/sentry-android-sqlite/build.gradle.kts b/sentry-android-sqlite/build.gradle.kts index 9cf09fd76fd..9637b91546a 100644 --- a/sentry-android-sqlite/build.gradle.kts +++ b/sentry-android-sqlite/build.gradle.kts @@ -53,10 +53,6 @@ android { buildFeatures { buildConfig = true } - // Needed b/c Kotlin 1.4.x would otherwise pull in an older version without the annotations we - // want. - configurations.all { resolutionStrategy.force(libs.jetbrains.annotations.get()) } - androidComponents.beforeVariants { it.enable = !Config.Android.shouldSkipDebugVariant(it.buildType) } @@ -75,14 +71,12 @@ dependencies { api(projects.sentry) compileOnly(libs.androidx.sqlite) - compileOnly(libs.jetbrains.annotations) implementation(kotlin(Config.kotlinStdLib, Config.kotlinStdLibVersionAndroid)) // tests testImplementation(libs.androidx.sqlite) testImplementation(libs.kotlin.test.junit) - testImplementation(libs.androidx.test.ext.junit) testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.inline) } diff --git a/sentry-android-sqlite/src/main/java/io/sentry/sqlite/SentrySQLiteDriver.kt b/sentry-android-sqlite/src/main/java/io/sentry/sqlite/SentrySQLiteDriver.kt index 4a616ba3abe..28b661cd3e7 100644 --- a/sentry-android-sqlite/src/main/java/io/sentry/sqlite/SentrySQLiteDriver.kt +++ b/sentry-android-sqlite/src/main/java/io/sentry/sqlite/SentrySQLiteDriver.kt @@ -3,9 +3,8 @@ package io.sentry.sqlite import androidx.sqlite.SQLiteConnection import androidx.sqlite.SQLiteDriver import io.sentry.ScopesAdapter -import io.sentry.SentryIntegrationPackageStorage import io.sentry.SentryLevel -import org.jetbrains.annotations.ApiStatus +import io.sentry.util.IntegrationUtils.addIntegrationToSdkVersion /** * Wraps a [SQLiteDriver] and automatically adds spans for each SQL statement it executes. @@ -23,16 +22,15 @@ import org.jetbrains.annotations.ApiStatus * ``` * * If you're using the Sentry Android Gradle Plugin (SAGP) 6.13.0+, wrapping will be performed - * automatically. + * automatically for Room. * * @param delegate The [SQLiteDriver] instance to delegate calls to. */ -@ApiStatus.Experimental public class SentrySQLiteDriver private constructor(private val delegate: SQLiteDriver) : SQLiteDriver { init { - SentryIntegrationPackageStorage.getInstance().addIntegration("SQLiteDriver") + addIntegrationToSdkVersion("SQLiteDriver") } @Suppress("INAPPLICABLE_JVM_NAME")