Merge branch 'main' into rz/perf/no-network-on-background

romtsn · web-flow · commit 38a7cbb7c272 · 2025-08-06T11:47:00.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@
     native <methods>;
   }
   ```
+- Fix abstract method error in `SentrySupportSQLiteDatabase` ([#4597](https://github.com/getsentry/sentry-java/pull/4597))
 
 ## 8.18.0
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -79,7 +79,7 @@ androidx-lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-commo
 androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "androidxLifecycle" }
 androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidxNavigation" }
 androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" }
-androidx-sqlite = { module = "androidx.sqlite:sqlite", version = "2.3.1" }
+androidx-sqlite = { module = "androidx.sqlite:sqlite", version = "2.5.2" }
 androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version = "1.2.1" }
 coil-compose = { module = "io.coil-kt:coil-compose", version = "2.6.0" }
 commons-compress = {module = "org.apache.commons:commons-compress", version = "1.25.0"}
diff --git a/sentry-android-sqlite/build.gradle.kts b/sentry-android-sqlite/build.gradle.kts
@@ -54,7 +54,14 @@ android {
   }
 }
 
-kotlin { explicitApi() }
+kotlin {
+  explicitApi()
+  compilerOptions {
+    // skip metadata version check, as androidx.sqlite:sqlite is compiled against a newer version of
+    // Kotlin
+    freeCompilerArgs.add("-Xskip-metadata-version-check")
+  }
+}
 
 dependencies {
   api(projects.sentry)

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`native <methods>;`
`22`	`22`	`}`
`23`	`23`	```
	`24`	+- Fix abstract method error in `SentrySupportSQLiteDatabase` ([#4597](https://github.com/getsentry/sentry-java/pull/4597))
`24`	`25`
`25`	`26`	`## 8.18.0`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,14 @@ android {`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`-kotlin { explicitApi() }`
	`57`	`+kotlin {`
	`58`	`+ explicitApi()`
	`59`	`+ compilerOptions {`
	`60`	`+ // skip metadata version check, as androidx.sqlite:sqlite is compiled against a newer version of`
	`61`	`+ // Kotlin`
	`62`	`+ freeCompilerArgs.add("-Xskip-metadata-version-check")`
	`63`	`+ }`
	`64`	`+}`
`58`	`65`
`59`	`66`	`dependencies {`
`60`	`67`	`api(projects.sentry)`