Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
6 changes: 0 additions & 6 deletions sentry-android-sqlite/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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()) }
Comment thread
0xadam-brown marked this conversation as resolved.

androidComponents.beforeVariants {
it.enable = !Config.Android.shouldSkipDebugVariant(it.buildType)
}
Expand All @@ -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)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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")
Expand Down
Loading