Upgrade sdks

Author: Simon Schubert

android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/PreferenceUtil.kt

@@ -29,9 +29,7 @@ class PreferenceUtil(private val context: Context) {
         saveBookmarkIds()
     }
 
-    fun hasBookmark(id: Long): Boolean {
-        return bookmarksIds.contains(id)
-    }
+    fun hasBookmark(id: Long): Boolean = bookmarksIds.contains(id)
 
     fun isDatabaseUpToDate(context: Context): Boolean {
         val prefs = PreferenceManager.getDefaultSharedPreferences(context)

build.gradle.kts

@@ -1,7 +1,7 @@
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 
 plugins {
-    id("com.github.ben-manes.versions") version "0.51.0"
+    id("com.github.ben-manes.versions") version "0.52.0"
     alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.spotless)
 }

common/build.gradle.kts

@@ -7,7 +7,7 @@ repositories {
 plugins {
     kotlin("multiplatform")
     id("com.android.library")
-    id("com.squareup.sqldelight")
+    id("app.cash.sqldelight")
 }
 
 group = "com.linuxcommandlibrary"
@@ -66,7 +66,9 @@ android {
 }
 
 sqldelight {
-    database("CommandDatabase") {
-        packageName = "com.linuxcommandlibrary"
+    databases {
+        create("CommandDatabase") {
+            packageName.set("com.linuxcommandlibrary")
+        }
     }
 }

common/src/androidMain/kotlin/com/linuxcommandlibrary/shared/Platform.kt

@@ -1,9 +1,9 @@
 package com.linuxcommandlibrary.shared
 
 import android.content.Context
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.driver.android.AndroidSqliteDriver
 import com.linuxcommandlibrary.CommandDatabase
-import com.squareup.sqldelight.android.AndroidSqliteDriver
-import com.squareup.sqldelight.db.SqlDriver
 import java.io.File
 import java.io.InputStream
 import java.io.OutputStream

gradle/libs.versions.toml

@@ -1,23 +1,21 @@
 [versions]
-kotlin = "2.1.10"
+kotlin = "2.1.20"
 accompanistAppcompatTheme = "0.36.0"
 activityCompose = "1.10.1"
-androidDriver = "1.5.5"
 foundation = "1.7.8"
 gradle = "8.9.0"
-gradlePlugin = "1.5.5"
-json = "20240303"
+json = "20250107"
 koinCore = "4.0.2"
 kotlinGradlePlugin = "2.1.0"
 kotlinxCoroutinesCore = "1.10.1"
-kotlinxHtmlJvm = "0.11.0"
+kotlinxHtmlJvm = "0.12.0"
 lifecycleViewmodelCompose = "2.8.7"
 material = "1.7.8"
-navigationCompose = "2.8.8"
+navigationCompose = "2.8.9"
 preference = "1.2.1"
-sqliteDriver = "1.5.5"
+sqldelight = "2.0.1"
 uiToolingPreview = "1.7.8"
-spotless = "6.22.0"
+spotless = "7.0.2"
 
 
 [libraries]
@@ -35,17 +33,17 @@ androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", v
 androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "uiToolingPreview" }
 androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "uiToolingPreview" }
 gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
-gradle-plugin = { module = "com.squareup.sqldelight:gradle-plugin", version.ref = "gradlePlugin" }
 json = { module = "org.json:json", version.ref = "json" }
 koin-android = { module = "io.insert-koin:koin-android", version.ref = "koinCore" }
 koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koinCore" }
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koinCore" }
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinGradlePlugin" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
 kotlinx-html-jvm = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version.ref = "kotlinxHtmlJvm" }
-runtime = { module = "com.squareup.sqldelight:runtime", version.ref = "androidDriver" }
-sqldelight-android-driver = { module = "com.squareup.sqldelight:android-driver", version.ref = "androidDriver" }
-sqldelight-sqlite-driver = { module = "com.squareup.sqldelight:sqlite-driver", version.ref = "sqliteDriver" }
+gradle-plugin = { module = "app.cash.sqldelight:gradle-plugin", version.ref = "sqldelight" }
+runtime = { module = "app.cash.sqldelight:runtime", version.ref = "sqldelight" }
+sqldelight-android-driver = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }
+sqldelight-sqlite-driver = { module = "app.cash.sqldelight:sqlite-driver", version.ref = "sqldelight" }
 
 
 [plugins]

settings.gradle.kts

@@ -4,9 +4,6 @@ pluginManagement {
         gradlePluginPortal()
         mavenCentral()
     }
-    plugins {
-        kotlin("multiplatform") version "2.1.0"
-    }
 }
 rootProject.name = "Linux Command Library"