fix: resolve CI failures — missing drawables, spotless, and test native lib

- Add ic_thermostat.xml and ic_person.xml to fdroid res/drawable for
  osmdroid marker icons (moved to compose resources on main)
- Fix spotless formatting in DeepLinkRouterTest
- Add sqlite-bundled-jvm runtimeOnly to core:database androidHostTest
  so BundledSQLiteDriver can load on the host JVM

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
James Rich
2026-05-31 10:19:13 -05:00
parent bcd8f7fef5
commit 1edc6de63f
4 changed files with 22 additions and 10 deletions
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M480,480Q414,480 367,433Q320,386 320,320Q320,254 367,207Q414,160 480,160Q546,160 593,207Q640,254 640,320Q640,386 593,433Q546,480 480,480ZM160,720L160,688Q160,654 177.5,625.5Q195,597 224,582Q286,551 350,535.5Q414,520 480,520Q546,520 610,535.5Q674,551 736,582Q765,597 782.5,625.5Q800,654 800,688L800,720Q800,753 776.5,776.5Q753,800 720,800L240,800Q207,800 183.5,776.5Q160,753 160,720Z"/>
</vector>
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M560,440Q543,440 531.5,428.5Q520,417 520,400Q520,383 531.5,371.5Q543,360 560,360L680,360Q697,360 708.5,371.5Q720,383 720,400Q720,417 708.5,428.5Q697,440 680,440L560,440ZM560,280Q543,280 531.5,268.5Q520,257 520,240Q520,223 531.5,211.5Q543,200 560,200L800,200Q817,200 828.5,211.5Q840,223 840,240Q840,257 828.5,268.5Q817,280 800,280L560,280ZM320,840Q237,840 178.5,781.5Q120,723 120,640Q120,592 141,550.5Q162,509 200,480L200,240Q200,190 235,155Q270,120 320,120Q370,120 405,155Q440,190 440,240L440,480Q478,509 499,550.5Q520,592 520,640Q520,723 461.5,781.5Q403,840 320,840ZM200,640L440,640Q440,611 427.5,586Q415,561 392,544L360,520L360,240Q360,223 348.5,211.5Q337,200 320,200Q303,200 291.5,211.5Q280,223 280,240L280,520L248,544Q225,561 212.5,586Q200,611 200,640Z"/>
</vector>
+2
View File
@@ -53,6 +53,8 @@ kotlin {
val androidHostTest by getting {
dependencies {
implementation(libs.androidx.sqlite.bundled)
// JVM variant provides the host-platform native for BundledSQLiteDriver
runtimeOnly("androidx.sqlite:sqlite-bundled-jvm:2.6.2")
implementation(libs.androidx.room.testing)
implementation(libs.androidx.test.ext.junit)
implementation(libs.junit)
@@ -392,11 +392,7 @@ class DeepLinkRouterTest {
fun `discovery session deep link resolves session ID`() {
val result = route("/settings/local-mesh-discovery/session/42")
assertEquals(
listOf(
SettingsRoute.Settings(null),
DiscoveryRoute.DiscoveryGraph,
DiscoveryRoute.DiscoverySummary(42L),
),
listOf(SettingsRoute.Settings(null), DiscoveryRoute.DiscoveryGraph, DiscoveryRoute.DiscoverySummary(42L)),
result,
)
}
@@ -405,11 +401,7 @@ class DeepLinkRouterTest {
fun `discovery alias localmeshdiscovery resolves session ID`() {
val result = route("/settings/localmeshdiscovery/session/99")
assertEquals(
listOf(
SettingsRoute.Settings(null),
DiscoveryRoute.DiscoveryGraph,
DiscoveryRoute.DiscoverySummary(99L),
),
listOf(SettingsRoute.Settings(null), DiscoveryRoute.DiscoveryGraph, DiscoveryRoute.DiscoverySummary(99L)),
result,
)
}