From 4ddb15c538e2a56814f83e030c4708228ad81a40 Mon Sep 17 00:00:00 2001
From: William Walker <wnwalker@ucsc.edu>
Date: Sun, 14 Jul 2024 16:01:52 -0700
Subject: [PATCH] Remove redundant lib version vars, go back to bundled-sqlite
snapshots
---
gradle/libs.versions.toml | 5 ++---
.../kotlin/edu/ucsc/its/temerity/shared/ui/MainScreen.kt | 4 +---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2be03ff..82b7994 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -22,10 +22,8 @@ mosaic = "0.11.0"
molecule = "2.0.0"
androidxLifecycle = "2.8.3"
jetbrainsNavigationCompose = "2.7.0-alpha07"
-androidxRoom = "2.7.0-alpha02"
-sqlite = "2.5.0-SNAPSHOT"
androidxRoom = "2.7.0-alpha05"
-sqlite = "2.5.0-alpha05"
+sqlite = "2.5.0-SNAPSHOT"
androidxDatastore = "1.1.1"
material3WindowSizeClass = "0.5.0"
@@ -65,6 +63,7 @@ ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref =
ktor-client-logging = { group = "io.ktor", name = "ktor-client-logging", version.ref = "ktor" }
ktor-client-serialization = { group = "io.ktor", name = "ktor-client-serialization", version.ref = "ktor" }
ktor-client-java = { group = "io.ktor", name = "ktor-client-java", version.ref = "ktor" }
+ktor-client-android = { group = "io.ktor", name = "ktor-client-android", version.ref = "ktor" }
ktor-test = { group = "io.ktor", name = "ktor-client-mock", version.ref = "ktor" }
slf4j = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
diff --git a/shared/compose/src/commonMain/kotlin/edu/ucsc/its/temerity/shared/ui/MainScreen.kt b/shared/compose/src/commonMain/kotlin/edu/ucsc/its/temerity/shared/ui/MainScreen.kt
index 7b7f05b..15565d2 100644
--- a/shared/compose/src/commonMain/kotlin/edu/ucsc/its/temerity/shared/ui/MainScreen.kt
+++ b/shared/compose/src/commonMain/kotlin/edu/ucsc/its/temerity/shared/ui/MainScreen.kt
@@ -122,9 +122,7 @@ fun MainScreen() {
}
composable(MainContentWindow.Devices.name) {
DeviceList(
- devicesList.filter {
- val fs =
- }
+ devicesList
)
}
composable(MainContentWindow.Roster.name) {
--
GitLab