update sqldelight to 1.5.3 + other minor fixes

Author: racka98

buildSrc/src/main/kotlin/Versions.kt

@@ -10,7 +10,7 @@ object Versions {
     const val composeDesktop = "1.1.1"
 
     // Squareup
-    const val sqlDelight = "1.5.0"
+    const val sqlDelight = "1.5.3"
 
     // Architecture
     const val mviKotlin = "3.0.0-beta01"
@@ -24,7 +24,7 @@ object Versions {
     const val coreKtx = "1.7.0"
 
     // Compose Base
-    const val compose = "1.2.0-alpha06"
+    const val compose = "1.2.0-alpha07"
     const val composeConstraintLayout = "1.0.0-beta02"
     const val composeMaterial3 = "1.0.0-alpha08"
     const val activityCompose = "1.4.0"

common/features/list/src/commonTest/kotlin/work.racka.thinkrchive.v2.common/features/list/repository/ListRepositoryTest.kt

@@ -223,10 +223,11 @@ class ListRepositoryTest : KoinTest {
         val data = repo.getThinkpadsLowPriceFirst(query)
         launch {
             data.test {
-                val actual = expectMostRecentItem()
+                val actual = awaitItem()
 
                 verify { dao.getThinkpadsLowPriceFirst(query) }
                 assertEquals(expected, actual)
+                awaitComplete()
             }
         }
     }

common/persistence/database/src/androidMain/kotlin/work/racka/thinkrchive/v2/common/database/di/Platform.kt

@@ -14,7 +14,11 @@ internal actual object Platform {
                 context = get(),
                 name = Constants.THINKPAD_DATABASE
             )
-            ThinkrchiveDatabaseWrapper(ThinkpadDatabase(driver))
+            ThinkrchiveDatabaseWrapper(
+                ThinkpadDatabase(
+                    driver = driver
+                )
+            )
         }
     }
 }

common/persistence/database/src/androidTest/kotlin/work/racka/thinkrchive/v2/common/database/di/TestPlatform.kt

@@ -10,7 +10,11 @@ internal actual object TestPlatform {
         single {
             val driver = JdbcSqliteDriver(JdbcSqliteDriver.IN_MEMORY)
                 .also { ThinkpadDatabase.Schema.create(it) }
-            ThinkrchiveDatabaseWrapper(ThinkpadDatabase(driver))
+            ThinkrchiveDatabaseWrapper(
+                ThinkpadDatabase(
+                    driver = driver
+                )
+            )
         }
     }
 }

common/persistence/database/src/commonMain/kotlin/work.racka.thinkrchive.v2.common.database/util/TypeAdapters.kt

@@ -0,0 +1,16 @@
+package work.racka.thinkrchive.v2.common.database.util
+
+import com.squareup.sqldelight.ColumnAdapter
+
+internal object TypeAdapters {
+    private val longToIntAdapter = object : ColumnAdapter<Int, Long> {
+        override fun decode(databaseValue: Long): Int = databaseValue.toInt()
+        override fun encode(value: Int): Long = value.toLong()
+    }
+
+    // To be used when upgrading to 2.0.0 release
+    /*fun thinkpadListTableAdapter() = ThinkpadListTable(
+        marketPriceEndAdapter = longToIntAdapter,
+        marketPriceStartAdapter = longToIntAdapter
+    )*/
+}

common/persistence/database/src/desktopMain/kotlin/work/racka/thinkrchive/v2/common/database/di/Platform.kt

@@ -10,7 +10,11 @@ internal actual object Platform {
         single {
             val driver = JdbcSqliteDriver(JdbcSqliteDriver.IN_MEMORY)
                 .also { ThinkpadDatabase.Schema.create(it) }
-            ThinkrchiveDatabaseWrapper(ThinkpadDatabase(driver))
+            ThinkrchiveDatabaseWrapper(
+                ThinkpadDatabase(
+                    driver = driver
+                )
+            )
         }
     }
 }

common/persistence/database/src/desktopTest/kotlin/work/racka/thinkrchive/v2/common/database/di/TestPlatform.kt

@@ -10,7 +10,11 @@ internal actual object TestPlatform {
         single {
             val driver = JdbcSqliteDriver(JdbcSqliteDriver.IN_MEMORY)
                 .also { ThinkpadDatabase.Schema.create(it) }
-            ThinkrchiveDatabaseWrapper(ThinkpadDatabase(driver))
+            ThinkrchiveDatabaseWrapper(
+                ThinkpadDatabase(
+                    driver = driver
+                )
+            )
         }
     }
 }

desktopApp/build.gradle.kts

@@ -32,7 +32,7 @@ kotlin {
                 implementation(compose.ui)
                 @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
                 implementation(compose.desktop.components.splitPane)
-                implementation("org.jetbrains.compose.material:material-icons-extended-desktop:1.0.0-rc11")
+                implementation(compose.materialIconsExtended)
 
                 implementation(Dependencies.OrbitMVI.core)