Converting data module to kmp - WIP

app/src/main/java/org/tasks/injection/ProductionModule.kt

@@ -2,7 +2,7 @@ package org.tasks.injection
 
 import android.content.Context
 import androidx.room.Room
-import org.tasks.data.db.Database
+import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -11,8 +11,9 @@ import dagger.hilt.components.SingletonComponent
 import org.tasks.BuildConfig
 import org.tasks.R
 import org.tasks.caldav.FileStorage
-import org.tasks.data.dao.CaldavDao
 import org.tasks.data.OpenTaskDao
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.db.Database
 import org.tasks.db.Migrations
 import org.tasks.jobs.WorkManager
 import org.tasks.jobs.WorkManagerImpl
@@ -31,8 +32,13 @@ internal class ProductionModule {
         preferences: Preferences,
         fileStorage: FileStorage,
     ): Database {
-        val builder = Room.databaseBuilder(context, Database::class.java, Database.NAME)
+        val databaseFile = context.getDatabasePath(Database.NAME)
+        val builder = Room.databaseBuilder<Database>(
+            context = context,
+            name = databaseFile.absolutePath
+        )
             .addMigrations(*Migrations.migrations(context, fileStorage))
+            .openHelperFactory(FrameworkSQLiteOpenHelperFactory())
         if (!BuildConfig.DEBUG || !preferences.getBoolean(R.string.p_crash_main_queries, false)) {
             builder.allowMainThreadQueries()
         }

build.gradle.kts

@@ -1,5 +1,7 @@
 plugins {
     id("com.google.devtools.ksp") version "1.9.24-1.0.20" apply false
+    alias(libs.plugins.androidLibrary).apply(false)
+    alias(libs.plugins.kotlinMultiplatform).apply(false)
 }
 
 buildscript {

data/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("com.android.library")
+    alias(libs.plugins.kotlinMultiplatform)
-    kotlin("android")
+    alias(libs.plugins.androidLibrary)
     id("com.google.devtools.ksp")
     id("kotlin-parcelize")
     kotlin("plugin.serialization") version "1.9.24"
@@ -11,6 +11,26 @@ repositories {
     google()
 }
 
+kotlin {
+    applyDefaultHierarchyTemplate()
+    androidTarget {
+        publishLibraryVariants("release")
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
+    }
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation(libs.androidx.room)
+                implementation(libs.kotlinx.serialization)
+                implementation(libs.kermit)
+            }
+        }
+    }
+}
 android {
     namespace = "org.tasks.data"
     compileSdk = 34
@@ -44,14 +64,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
-    }
 }
 
 dependencies {
-    implementation(libs.androidx.room)
+    add("kspAndroid", libs.androidx.room.compiler)
-    implementation(libs.kotlinx.serialization)
-    implementation(libs.timber)
-    ksp(libs.androidx.room.compiler)
 }

data/src/commonMain/kotlin/org/tasks/data/dao/TaskDao.kt

@@ -7,6 +7,7 @@ import androidx.room.RawQuery
 import androidx.room.Update
 import androidx.room.withTransaction
 import androidx.sqlite.db.SimpleSQLiteQuery
+import co.touchlab.kermit.Logger
 import org.tasks.data.BuildConfig
 import org.tasks.data.TaskContainer
 import org.tasks.data.UUIDHelper
@@ -18,7 +19,6 @@ import org.tasks.data.entity.Task
 import org.tasks.data.sql.Criterion
 import org.tasks.data.sql.Functions
 import org.tasks.time.DateTimeUtils2
-import timber.log.Timber
 
 private const val MAX_TIME = 9999999999999
 
@@ -117,11 +117,9 @@ FROM (
                     query(SimpleSQLiteQuery(queries[i]))
                 }
                 val result = fetchTasks(SimpleSQLiteQuery(queries[last]))
-                Timber.v(
+                Logger.v("TaskDao") {
-                    "%sms: %s",
+                    "${DateTimeUtils2.currentTimeMillis() - start}ms: ${queries.joinToString(";\n")}"
-                    DateTimeUtils2.currentTimeMillis() - start,
+                }
-                    queries.joinToString(";\n")
-                )
                 result
             }
 

data/src/commonMain/kotlin/org/tasks/data/entity/Task.kt

@@ -7,6 +7,7 @@ import androidx.room.Entity
 import androidx.room.Ignore
 import androidx.room.Index
 import androidx.room.PrimaryKey
+import co.touchlab.kermit.Logger
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.RawValue
 import kotlinx.serialization.ExperimentalSerializationApi
@@ -16,7 +17,6 @@ import kotlinx.serialization.Transient
 import kotlinx.serialization.json.JsonNames
 import org.tasks.data.db.Table
 import org.tasks.data.sql.Field
-import timber.log.Timber
 
 const val SUPPRESS_SYNC = "suppress_sync"
 const val FORCE_CALDAV_SYNC = "force_caldav_sync"
@@ -356,7 +356,7 @@ data class Task @OptIn(ExperimentalSerializationApi::class) constructor(
                 val value = uuid.toLong()
                 value > 0
             } catch (e: NumberFormatException) {
-                Timber.e(e)
+                Logger.e("Invalid uuid", e, tag = "Task")
                 isUuidEmpty(uuid)
             }
         }

data/src/commonMain/kotlin/org/tasks/data/entity/UserActivity.kt

@@ -7,12 +7,12 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Ignore
 import androidx.room.PrimaryKey
+import co.touchlab.kermit.Logger
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import org.json.JSONException
 import org.json.JSONObject
 import org.tasks.data.db.Table
-import timber.log.Timber
 import java.io.File
 
 @Serializable
@@ -92,7 +92,7 @@ class UserActivity : Parcelable {
                 if (value.isNullOrBlank()) {
                     return null
                 }
-                if (value!!.contains("uri") || value.contains("path")) {
+                if (value.contains("uri") || value.contains("path")) {
                     val json = JSONObject(value)
                     if (json.has("uri")) {
                         return Uri.parse(json.getString("uri"))
@@ -104,7 +104,7 @@ class UserActivity : Parcelable {
                 }
                 null
             } catch (e: JSONException) {
-                Timber.e(e)
+                Logger.e("Failed to parse picture uri", e, tag = "UserActivity")
                 null
             }
         }

deps_fdroid.txt

@@ -1,6 +1,6 @@
 ++--- androidx.databinding:viewbinding:8.4.0
-+|    \--- androidx.annotation:annotation:1.0.0 -> 1.7.1
++|    \--- androidx.annotation:annotation:1.0.0 -> 1.8.0
-+|         \--- androidx.annotation:annotation-jvm:1.7.1
++|         \--- androidx.annotation:annotation-jvm:1.8.0
 +|              \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.9.24
 +|                   +--- org.jetbrains:annotations:13.0 -> 23.0.0
 +|                   +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0 -> 1.9.24 (c)
@@ -10,21 +10,21 @@
 ++--- androidx.databinding:databinding-runtime:8.4.0
 +|    +--- androidx.collection:collection:1.0.0 -> 1.4.0
 +|    |    \--- androidx.collection:collection-jvm:1.4.0
-+|    |         +--- androidx.annotation:annotation:1.7.0 -> 1.7.1 (*)
++|    |         +--- androidx.annotation:annotation:1.7.0 -> 1.8.0 (*)
 +|    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|    |         +--- androidx.collection:collection-ktx:1.4.0 (c)
 +|    |         \--- androidx.collection:collection-ktx:1.3.0 -> 1.4.0 (c)
 +|    +--- androidx.databinding:databinding-common:8.4.0
 +|    +--- androidx.databinding:viewbinding:8.4.0 (*)
 +|    \--- androidx.lifecycle:lifecycle-runtime:2.6.1 -> 2.7.0
-+|         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         +--- androidx.arch.core:core-common:2.2.0
-+|         |    \--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    \--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         +--- androidx.arch.core:core-runtime:2.2.0
-+|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    \--- androidx.arch.core:core-common:2.2.0 (*)
 +|         +--- androidx.lifecycle:lifecycle-common:2.7.0
-+|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.7.3
 +|         |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3
@@ -32,8 +32,8 @@
 +|         |    |    |         +--- org.jetbrains:annotations:23.0.0
 +|         |    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
 +|         |    |    |         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 (c)
-+|         |    |    |         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (c)
++|         |    |    |         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 (c)
-+|         |    |    |         |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 (c)
++|         |    |    |         |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (c)
 +|         |    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 -> 1.9.24
 +|         |    |    |         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.24 (*)
 +|         |    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.24
@@ -57,14 +57,14 @@
 +|         |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 (c)
 +|         |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 (c)
 +|         +--- androidx.profileinstaller:profileinstaller:1.3.0 -> 1.3.1
-+|         |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|         |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|         |    +--- androidx.concurrent:concurrent-futures:1.1.0
-+|         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    |    \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 +|         |    +--- androidx.startup:startup-runtime:1.1.1
-+|         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    |    \--- androidx.tracing:tracing:1.0.0
-+|         |    |         \--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    |         \--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 +|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|         +--- androidx.lifecycle:lifecycle-common:2.7.0 (c)
@@ -88,7 +88,7 @@
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 1.9.24 (*)
 +|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.7.3 (*)
 +|    +--- androidx.lifecycle:lifecycle-runtime-ktx:2.6.1 -> 2.7.0
-+|    |    +--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.7.0 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.7.3 (*)
@@ -158,7 +158,7 @@
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 (c)
 +|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 (c)
 +|    +--- androidx.lifecycle:lifecycle-process:2.6.1 -> 2.7.0
-+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.7.0 (*)
 +|    |    +--- androidx.startup:startup-runtime:1.1.1 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
@@ -192,7 +192,7 @@
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 (c)
 +|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 (c)
 +|    \--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 -> 2.7.0
-+|         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|         +--- androidx.lifecycle:lifecycle-common:2.7.0 (c)
 +|         +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
@@ -213,49 +213,54 @@
 +|         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.24 (*)
 ++--- project :data
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.24 (*)
-+|    +--- androidx.room:room-ktx:2.6.1
++|    +--- androidx.room:room-runtime:2.7.0-alpha02
-+|    |    +--- androidx.room:room-common:2.6.1
++|    |    \--- androidx.room:room-runtime-android:2.7.0-alpha02
-+|    |    |    +--- androidx.annotation:annotation:1.3.0 -> 1.7.1 (*)
++|    |         +--- androidx.annotation:annotation:1.8.0 (*)
-+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.24 (*)
++|    |         +--- androidx.annotation:annotation-experimental:1.4.1
-+|    |    |    +--- androidx.room:room-ktx:2.6.1 (c)
++|    |         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.9.24 (*)
-+|    |    |    \--- androidx.room:room-runtime:2.6.1 (c)
++|    |         +--- androidx.arch.core:core-runtime:2.2.0 (*)
-+|    |    +--- androidx.room:room-runtime:2.6.1
++|    |         +--- androidx.room:room-common:2.7.0-alpha02
-+|    |    |    +--- androidx.annotation:annotation-experimental:1.1.0-rc01 -> 1.4.0
++|    |         |    \--- androidx.room:room-common-jvm:2.7.0-alpha02
-+|    |    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.9.24 (*)
++|    |         |         +--- androidx.annotation:annotation:1.8.0 (*)
-+|    |    |    +--- androidx.arch.core:core-runtime:2.2.0 (*)
++|    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
-+|    |    |    +--- androidx.room:room-common:2.6.1 (*)
++|    |         |         \--- androidx.room:room-runtime:2.7.0-alpha02 (c)
-+|    |    |    +--- androidx.sqlite:sqlite:2.4.0
++|    |         +--- androidx.sqlite:sqlite:2.5.0-alpha02
-+|    |    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |         |    \--- androidx.sqlite:sqlite-android:2.5.0-alpha02
-+|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
++|    |         |         +--- androidx.annotation:annotation:1.8.0 (*)
-+|    |    |    |    \--- androidx.sqlite:sqlite-framework:2.4.0 (c)
++|    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
-+|    |    |    +--- androidx.sqlite:sqlite-framework:2.4.0
++|    |         |         \--- androidx.sqlite:sqlite-framework:2.5.0-alpha02 (c)
-+|    |    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |         +--- androidx.sqlite:sqlite-framework:2.5.0-alpha02
-+|    |    |    |    +--- androidx.sqlite:sqlite:2.4.0 (*)
++|    |         |    \--- androidx.sqlite:sqlite-framework-android:2.5.0-alpha02
-+|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
++|    |         |         +--- androidx.annotation:annotation:1.8.0 (*)
-+|    |    |    |    \--- androidx.sqlite:sqlite:2.4.0 (c)
++|    |         |         +--- androidx.sqlite:sqlite:2.5.0-alpha02 (*)
-+|    |    |    +--- androidx.room:room-common:2.6.1 (c)
++|    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
-+|    |    |    \--- androidx.room:room-ktx:2.6.1 (c)
++|    |         |         \--- androidx.sqlite:sqlite:2.5.0-alpha02 (c)
 +|    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
-+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.7.3 (*)
++|    |         +--- org.jetbrains.kotlinx:atomicfu:0.17.0
-+|    |    +--- androidx.room:room-common:2.6.1 (c)
++|    |         |    \--- org.jetbrains.kotlinx:atomicfu-jvm:0.17.0
-+|    |    \--- androidx.room:room-runtime:2.6.1 (c)
++|    |         |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.0 -> 1.9.24 (*)
++|    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 (*)
++|    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*)
++|    |         \--- androidx.room:room-common:2.7.0-alpha02 (c)
 +|    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3
 +|    |    \--- org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3
 +|    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 1.9.24 (*)
 +|    |         +--- org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3
-+|    |         |    +--- org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3 (c)
 +|    |         |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3 (c)
 +|    |         |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3 (c)
++|    |         |    +--- org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3 (c)
 +|    |         |    \--- org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3 (c)
-+|    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22 -> 1.9.24 (*)
 +|    |         \--- org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3
 +|    |              \--- org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3
 +|    |                   +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 1.9.24 (*)
 +|    |                   +--- org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3 (*)
 +|    |                   \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22 -> 1.9.24 (*)
-+|    +--- com.jakewharton.timber:timber:5.0.1
++|    +--- co.touchlab:kermit:2.0.3
-+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.9.24 (*)
++|    |    \--- co.touchlab:kermit-android:2.0.3
-+|    |    \--- org.jetbrains:annotations:20.1.0 -> 23.0.0
++|    |         +--- co.touchlab:kermit-core:2.0.3
++|    |         |    \--- co.touchlab:kermit-core-android:2.0.3
++|    |         |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 1.9.24 (*)
++|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 1.9.24 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.24 (*)
 ++--- com.github.bitfireAT:dav4jvm:2.2.1
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20 -> 1.9.24 (*)
@@ -291,17 +296,17 @@
 +|    +--- org.slf4j:slf4j-jdk14:2.0.3
 +|    |    \--- org.slf4j:slf4j-api:2.0.3
 +|    \--- androidx.core:core-ktx:1.9.0 -> 1.13.0
-+|         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         +--- androidx.core:core:1.13.0
-+|         |    +--- androidx.annotation:annotation:1.6.0 -> 1.7.1 (*)
++|         |    +--- androidx.annotation:annotation:1.6.0 -> 1.8.0 (*)
-+|         |    +--- androidx.annotation:annotation-experimental:1.4.0 (*)
++|         |    +--- androidx.annotation:annotation-experimental:1.4.0 -> 1.4.1 (*)
 +|         |    +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
 +|         |    +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0 (*)
 +|         |    +--- androidx.interpolator:interpolator:1.0.0
-+|         |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|         |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|         |    +--- androidx.lifecycle:lifecycle-runtime:2.6.2 -> 2.7.0 (*)
 +|         |    +--- androidx.versionedparcelable:versionedparcelable:1.1.1
-+|         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    |    \--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
 +|         |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|         |    \--- androidx.core:core-ktx:1.13.0 (c)
@@ -315,18 +320,18 @@
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -> 1.9.24 (*)
 +|    +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.1
 +|    |    +--- androidx.activity:activity:1.6.0 -> 1.9.0
-+|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
 +|    |    |    +--- androidx.core:core:1.13.0 (*)
 +|    |    |    +--- androidx.lifecycle:lifecycle-runtime:2.6.1 -> 2.7.0 (*)
 +|    |    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 -> 2.7.0 (*)
 +|    |    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 -> 2.7.0
-+|    |    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    |    |    +--- androidx.core:core-ktx:1.2.0 -> 1.13.0 (*)
 +|    |    |    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.7.0 (*)
 +|    |    |    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.7.0 (*)
 +|    |    |    |    +--- androidx.savedstate:savedstate:1.2.1
-+|    |    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    |    |    +--- androidx.arch.core:core-common:2.1.0 -> 2.2.0 (*)
 +|    |    |    |    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 -> 2.7.0 (*)
 +|    |    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.9.24 (*)
@@ -352,13 +357,13 @@
 +|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|    |    |    +--- androidx.activity:activity-compose:1.9.0 (c)
 +|    |    |    \--- androidx.activity:activity-ktx:1.9.0 (c)
-+|    |    +--- androidx.annotation:annotation:1.3.0 -> 1.7.1 (*)
++|    |    +--- androidx.annotation:annotation:1.3.0 -> 1.8.0 (*)
 +|    |    +--- androidx.appcompat:appcompat-resources:1.6.1
-+|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
 +|    |    |    +--- androidx.core:core:1.6.0 -> 1.13.0 (*)
 +|    |    |    +--- androidx.vectordrawable:vectordrawable:1.1.0
-+|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    |    +--- androidx.core:core:1.1.0 -> 1.13.0 (*)
 +|    |    |    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
 +|    |    |    +--- androidx.vectordrawable:vectordrawable-animated:1.1.0
@@ -370,16 +375,16 @@
 +|    |    +--- androidx.core:core:1.9.0 -> 1.13.0 (*)
 +|    |    +--- androidx.core:core-ktx:1.8.0 -> 1.13.0 (*)
 +|    |    +--- androidx.cursoradapter:cursoradapter:1.0.0
-+|    |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    +--- androidx.drawerlayout:drawerlayout:1.0.0 -> 1.1.1
-+|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.core:core:1.2.0 -> 1.13.0 (*)
 +|    |    |    \--- androidx.customview:customview:1.1.0
-+|    |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |         +--- androidx.core:core:1.3.0 -> 1.13.0 (*)
 +|    |    |         \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
 +|    |    +--- androidx.emoji2:emoji2:1.2.0 -> 1.3.0
-+|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
 +|    |    |    +--- androidx.core:core:1.3.0 -> 1.13.0 (*)
 +|    |    |    +--- androidx.lifecycle:lifecycle-process:2.4.1 -> 2.7.0 (*)
@@ -392,8 +397,8 @@
 +|    |    |    \--- androidx.emoji2:emoji2:1.3.0 (c)
 +|    |    +--- androidx.fragment:fragment:1.3.6 -> 1.7.1
 +|    |    |    +--- androidx.activity:activity:1.8.1 -> 1.9.0 (*)
-+|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
-+|    |    |    +--- androidx.annotation:annotation-experimental:1.4.0 (*)
++|    |    |    +--- androidx.annotation:annotation-experimental:1.4.0 -> 1.4.1 (*)
 +|    |    |    +--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
 +|    |    |    +--- androidx.core:core-ktx:1.2.0 -> 1.13.0 (*)
 +|    |    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 -> 2.7.0 (*)
@@ -401,14 +406,14 @@
 +|    |    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 -> 2.7.0 (*)
 +|    |    |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 -> 2.7.0 (*)
 +|    |    |    +--- androidx.loader:loader:1.0.0
-+|    |    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    |    |    +--- androidx.core:core:1.0.0 -> 1.13.0 (*)
 +|    |    |    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.7.0 (*)
 +|    |    |    |    \--- androidx.lifecycle:lifecycle-viewmodel:2.0.0 -> 2.7.0 (*)
 +|    |    |    +--- androidx.profileinstaller:profileinstaller:1.3.1 (*)
 +|    |    |    +--- androidx.savedstate:savedstate:1.2.1 (*)
 +|    |    |    +--- androidx.viewpager:viewpager:1.0.0
-+|    |    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    |    |    +--- androidx.core:core:1.0.0 -> 1.13.0 (*)
 +|    |    |    |    \--- androidx.customview:customview:1.0.0 -> 1.1.0 (*)
 +|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
@@ -416,12 +421,12 @@
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.5.1 -> 2.7.0 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.5.1 -> 2.7.0 (*)
 +|    |    +--- androidx.resourceinspection:resourceinspection-annotation:1.0.1
-+|    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    +--- androidx.savedstate:savedstate:1.2.0 -> 1.2.1 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.9.24 (*)
 +|    |    \--- androidx.appcompat:appcompat-resources:1.6.1 (c)
 +|    +--- androidx.cardview:cardview:1.0.0
-+|    |    \--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    \--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    +--- androidx.lifecycle:lifecycle-extensions:2.2.0
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.7.0 (*)
 +|    |    +--- androidx.arch.core:core-common:2.1.0 -> 2.2.0 (*)
@@ -474,11 +479,11 @@
 +|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.24 (c)
 +|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 1.9.24 (c)
 +|    |    +--- androidx.activity:activity:1.8.0 -> 1.9.0 (*)
-+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    |    +--- androidx.appcompat:appcompat:1.6.1 (*)
 +|    |    +--- androidx.cardview:cardview:1.0.0 (*)
 +|    |    +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0
-+|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.core:core:1.1.0 -> 1.13.0 (*)
 +|    |    |    +--- androidx.customview:customview:1.0.0 -> 1.1.0 (*)
 +|    |    |    \--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
@@ -492,20 +497,20 @@
 +|    |    |    +--- androidx.core:core:1.0.0 -> 1.13.0 (*)
 +|    |    |    +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
 +|    |    |    \--- androidx.legacy:legacy-support-core-utils:1.0.0
-+|    |    |         +--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    |         +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    |         +--- androidx.core:core:1.0.0 -> 1.13.0 (*)
 +|    |    |         +--- androidx.documentfile:documentfile:1.0.0
-+|    |    |         |    \--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    |         |    \--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    |         +--- androidx.loader:loader:1.0.0 (*)
 +|    |    |         +--- androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
-+|    |    |         |    \--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    |         |    \--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    |         \--- androidx.print:print:1.0.0
-+|    |    |              \--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    |              \--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
-+|    |    +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.4.0 (*)
++|    |    +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.4.1 (*)
 +|    |    +--- androidx.fragment:fragment:1.2.5 -> 1.7.1 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.7.0 (*)
 +|    |    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2
-+|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
 +|    |    |    +--- androidx.core:core:1.7.0 -> 1.13.0 (*)
 +|    |    |    +--- androidx.customview:customview:1.0.0 -> 1.1.0 (*)
@@ -515,14 +520,14 @@
 +|    |    |    \--- androidx.viewpager2:viewpager2:1.1.0-beta02 (c)
 +|    |    +--- androidx.resourceinspection:resourceinspection-annotation:1.0.1 (*)
 +|    |    +--- androidx.transition:transition:1.5.0
-+|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
 +|    |    |    +--- androidx.core:core:1.13.0 (*)
 +|    |    |    \--- androidx.dynamicanimation:dynamicanimation:1.0.0 (*)
 +|    |    +--- androidx.vectordrawable:vectordrawable:1.1.0 (*)
 +|    |    \--- androidx.viewpager2:viewpager2:1.0.0 -> 1.1.0-beta02
-+|    |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
-+|    |         +--- androidx.annotation:annotation-experimental:1.3.0 -> 1.4.0 (*)
++|    |         +--- androidx.annotation:annotation-experimental:1.3.0 -> 1.4.1 (*)
 +|    |         +--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
 +|    |         +--- androidx.core:core:1.3.2 -> 1.13.0 (*)
 +|    |         +--- androidx.fragment:fragment:1.1.0 -> 1.7.1 (*)
@@ -541,8 +546,8 @@
 +|    |    +--- com.google.dagger:dagger:2.50 (*)
 +|    |    \--- javax.inject:javax.inject:1
 +|    +--- androidx.activity:activity:1.5.1 -> 1.9.0 (*)
-+|    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
-+|    +--- androidx.annotation:annotation-experimental:1.3.1 -> 1.4.0 (*)
++|    +--- androidx.annotation:annotation-experimental:1.3.1 -> 1.4.1 (*)
 +|    +--- androidx.fragment:fragment:1.5.1 -> 1.7.1 (*)
 +|    +--- androidx.lifecycle:lifecycle-common:2.5.1 -> 2.7.0 (*)
 +|    +--- androidx.lifecycle:lifecycle-viewmodel:2.5.1 -> 2.7.0 (*)
@@ -551,17 +556,17 @@
 +|    +--- javax.inject:javax.inject:1
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.20 -> 1.9.24 (*)
 ++--- androidx.hilt:hilt-work:1.2.0
-+|    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    +--- androidx.hilt:hilt-common:1.2.0
 +|    |    \--- com.google.dagger:hilt-core:2.49 -> 2.50 (*)
 +|    +--- androidx.work:work-runtime:2.3.4 -> 2.8.1
-+|    |    +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.4.0 (*)
++|    |    +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.4.1 (*)
 +|    |    +--- androidx.core:core:1.1.0 -> 1.13.0 (*)
 +|    |    +--- androidx.core:core:1.6.0 -> 1.13.0 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.7.0 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.7.0 (*)
-+|    |    +--- androidx.room:room-runtime:2.5.0 -> 2.6.1 (*)
++|    |    +--- androidx.room:room-runtime:2.5.0 -> 2.7.0-alpha02 (*)
-+|    |    +--- androidx.sqlite:sqlite-framework:2.3.0 -> 2.4.0 (*)
++|    |    +--- androidx.sqlite:sqlite-framework:2.3.0 -> 2.5.0-alpha02 (*)
 +|    |    +--- androidx.startup:startup-runtime:1.0.0 -> 1.1.1 (*)
 +|    |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 +|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 1.9.24 (*)
@@ -591,10 +596,10 @@
 +|    \--- androidx.fragment:fragment:1.7.1 (c)
 ++--- androidx.lifecycle:lifecycle-runtime-ktx:2.7.0 (*)
 ++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 (*)
-++--- androidx.room:room-ktx:2.6.1 (*)
+++--- androidx.room:room-runtime:2.7.0-alpha02 (*)
 ++--- androidx.appcompat:appcompat:1.6.1 (*)
 ++--- io.noties.markwon:core:4.6.2
-+|    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    \--- com.atlassian.commonmark:commonmark:0.13.0
 ++--- io.noties.markwon:editor:4.6.2
 +|    \--- io.noties.markwon:core:4.6.2 (*)
@@ -634,7 +639,7 @@
 +|         |    |         \--- androidx.compose.runtime:runtime-saveable:1.6.7 (c)
 +|         |    +--- androidx.compose.runtime:runtime-saveable:1.0.1 -> 1.6.7
 +|         |    |    \--- androidx.compose.runtime:runtime-saveable-android:1.6.7
-+|         |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    |         +--- androidx.compose.runtime:runtime:1.6.7 (*)
 +|         |    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|         |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 1.9.24 (*)
@@ -643,7 +648,7 @@
 +|         |    +--- androidx.compose.ui:ui:1.0.1 -> 1.6.7
 +|         |    |    \--- androidx.compose.ui:ui-android:1.6.7
 +|         |    |         +--- androidx.activity:activity-ktx:1.7.0 -> 1.9.0 (*)
-+|         |    |         +--- androidx.annotation:annotation:1.6.0 -> 1.7.1 (*)
++|         |    |         +--- androidx.annotation:annotation:1.6.0 -> 1.8.0 (*)
 +|         |    |         +--- androidx.autofill:autofill:1.0.0
 +|         |    |         |    \--- androidx.core:core:1.1.0 -> 1.13.0 (*)
 +|         |    |         +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
@@ -652,7 +657,7 @@
 +|         |    |         +--- androidx.compose.runtime:runtime-saveable:1.6.7 (*)
 +|         |    |         +--- androidx.compose.ui:ui-geometry:1.6.7
 +|         |    |         |    \--- androidx.compose.ui:ui-geometry-android:1.6.7
-+|         |    |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    |         |         +--- androidx.compose.runtime:runtime:1.2.1 -> 1.6.7 (*)
 +|         |    |         |         +--- androidx.compose.ui:ui-util:1.6.7
 +|         |    |         |         |    \--- androidx.compose.ui:ui-util-android:1.6.7
@@ -676,12 +681,12 @@
 +|         |    |         |         \--- androidx.compose.ui:ui-viewbinding:1.6.7 (c)
 +|         |    |         +--- androidx.compose.ui:ui-graphics:1.6.7
 +|         |    |         |    \--- androidx.compose.ui:ui-graphics-android:1.6.7
-+|         |    |         |         +--- androidx.annotation:annotation:1.7.0 -> 1.7.1 (*)
++|         |    |         |         +--- androidx.annotation:annotation:1.7.0 -> 1.8.0 (*)
 +|         |    |         |         +--- androidx.collection:collection:1.4.0 (*)
 +|         |    |         |         +--- androidx.compose.runtime:runtime:1.6.7 (*)
 +|         |    |         |         +--- androidx.compose.ui:ui-unit:1.6.7
 +|         |    |         |         |    \--- androidx.compose.ui:ui-unit-android:1.6.7
-+|         |    |         |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    |         |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    |         |         |         +--- androidx.collection:collection-ktx:1.2.0 -> 1.4.0 (*)
 +|         |    |         |         |         +--- androidx.compose.runtime:runtime:1.6.7 (*)
 +|         |    |         |         |         +--- androidx.compose.ui:ui-geometry:1.6.7 (*)
@@ -706,7 +711,7 @@
 +|         |    |         |         \--- androidx.compose.ui:ui-viewbinding:1.6.7 (c)
 +|         |    |         +--- androidx.compose.ui:ui-text:1.6.7
 +|         |    |         |    \--- androidx.compose.ui:ui-text-android:1.6.7
-+|         |    |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    |         |         +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
 +|         |    |         |         +--- androidx.compose.runtime:runtime:1.6.7 (*)
 +|         |    |         |         +--- androidx.compose.runtime:runtime-saveable:1.6.7 (*)
@@ -750,12 +755,12 @@
 +|         |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|         |    +--- androidx.activity:activity:1.9.0 (c)
 +|         |    \--- androidx.activity:activity-ktx:1.9.0 (c)
-+|         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
-+|         +--- androidx.annotation:annotation-experimental:1.4.0 (*)
++|         +--- androidx.annotation:annotation-experimental:1.4.0 -> 1.4.1 (*)
 +|         +--- androidx.collection:collection:1.4.0 (*)
 +|         +--- androidx.compose.animation:animation-core:1.6.0 -> 1.6.7
 +|         |    \--- androidx.compose.animation:animation-core-android:1.6.7
-+|         |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |         +--- androidx.collection:collection:1.4.0 (*)
 +|         |         +--- androidx.compose.runtime:runtime:1.6.7 (*)
 +|         |         +--- androidx.compose.ui:ui:1.6.7 (*)
@@ -767,15 +772,15 @@
 +|         |         \--- androidx.compose.animation:animation:1.6.7 (c)
 +|         +--- androidx.compose.foundation:foundation:1.6.0 -> 1.6.7
 +|         |    \--- androidx.compose.foundation:foundation-android:1.6.7
-+|         |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |         +--- androidx.collection:collection:1.4.0 (*)
 +|         |         +--- androidx.compose.animation:animation:1.6.7
 +|         |         |    \--- androidx.compose.animation:animation-android:1.6.7
-+|         |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |         |         +--- androidx.compose.animation:animation-core:1.6.7 (*)
 +|         |         |         +--- androidx.compose.foundation:foundation-layout:1.6.7
 +|         |         |         |    \--- androidx.compose.foundation:foundation-layout-android:1.6.7
-+|         |         |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |         |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |         |         |         +--- androidx.compose.animation:animation-core:1.2.1 -> 1.6.7 (*)
 +|         |         |         |         +--- androidx.compose.runtime:runtime:1.6.7 (*)
 +|         |         |         |         +--- androidx.compose.ui:ui:1.6.7 (*)
@@ -822,7 +827,7 @@
 +|         +--- androidx.compose.ui:ui-text:1.6.0 -> 1.6.7 (*)
 +|         +--- androidx.compose.ui:ui-util:1.6.0 -> 1.6.7 (*)
 +|         +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 -> 2.7.0
-+|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    +--- androidx.lifecycle:lifecycle-common:2.7.0 (*)
 +|         |    +--- androidx.lifecycle:lifecycle-common:2.7.0 (c)
 +|         |    +--- androidx.lifecycle:lifecycle-livedata:2.7.0 (c)
@@ -843,29 +848,31 @@
 +|         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 1.9.24 (*)
 ++--- androidx.constraintlayout:constraintlayout:2.1.4 (*)
 ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
-+|    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    +--- androidx.core:core:1.1.0 -> 1.13.0 (*)
 +|    \--- androidx.interpolator:interpolator:1.0.0 (*)
 ++--- androidx.preference:preference:1.2.1
-+|    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    +--- androidx.appcompat:appcompat:1.1.0 -> 1.6.1 (*)
 +|    +--- androidx.core:core:1.6.0 -> 1.13.0 (*)
 +|    +--- androidx.activity:activity-ktx:1.5.1 -> 1.9.0 (*)
 +|    +--- androidx.fragment:fragment-ktx:1.3.6 -> 1.7.1 (*)
 +|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
 +|    +--- androidx.slidingpanelayout:slidingpanelayout:1.2.0
-+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    +--- androidx.customview:customview:1.1.0 (*)
 +|    |    +--- androidx.core:core:1.1.0 -> 1.13.0 (*)
 +|    |    +--- androidx.window:window:1.0.0
 +|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.0 -> 1.9.24 (*)
 +|    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.7.3 (*)
-+|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
 +|    |    |    \--- androidx.core:core:1.3.2 -> 1.13.0 (*)
 +|    |    \--- androidx.transition:transition:1.4.1 -> 1.5.0 (*)
 +|    \--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
-++--- com.jakewharton.timber:timber:5.0.1 (*)
+++--- com.jakewharton.timber:timber:5.0.1
++|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.9.24 (*)
++|    \--- org.jetbrains:annotations:20.1.0 -> 23.0.0
 ++--- com.google.android.apps.dashclock:dashclock-api:2.0.0
 ++--- com.github.twofortyfouram:android-plugin-api-for-locale:1.0.2
 ++--- com.rubiconproject.oss:jchronic:0.2.6
@@ -907,20 +914,20 @@
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 1.9.24 (*)
 +|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*)
 ++--- com.etebase:client:2.3.2
-+|    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    \--- com.squareup.okhttp3:logging-interceptor:3.12.1
 +|         \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.12.0 (*)
 ++--- com.github.QuadFlask:colorpicker:0.0.15
 +|    \--- androidx.appcompat:appcompat:1.1.0 -> 1.6.1 (*)
 ++--- net.openid:appauth:0.11.1
-+|    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    +--- androidx.appcompat:appcompat:1.3.0 -> 1.6.1 (*)
 +|    \--- androidx.browser:browser:1.3.0
 +|         +--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
 +|         +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0 (*)
 +|         +--- androidx.interpolator:interpolator:1.0.0 (*)
 +|         +--- androidx.core:core:1.1.0 -> 1.13.0 (*)
-+|         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 ++--- org.osmdroid:osmdroid-android:6.1.18
 ++--- com.squareup.retrofit2:retrofit:2.9.0
@@ -973,7 +980,7 @@
 ++--- androidx.compose.foundation:foundation -> 1.6.7 (*)
 ++--- androidx.compose.material:material -> 1.6.7
 +|    \--- androidx.compose.material:material-android:1.6.7
-+|         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         +--- androidx.compose.animation:animation:1.6.7 (*)
 +|         +--- androidx.compose.animation:animation-core:1.6.7 (*)
 +|         +--- androidx.compose.foundation:foundation:1.6.7 (*)
@@ -1019,7 +1026,7 @@
 +|         +--- androidx.compose.material:material-icons-core:1.6.7 (c)
 +|         \--- androidx.compose.material:material-ripple:1.6.7 (c)
 ++--- androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0
-+|    +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.4.0 (*)
++|    +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.4.1 (*)
 +|    +--- androidx.compose.runtime:runtime:1.0.1 -> 1.6.7 (*)
 +|    +--- androidx.compose.ui:ui:1.0.1 -> 1.6.7 (*)
 +|    +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (*)
@@ -1054,7 +1061,7 @@
 +|    \--- androidx.compose.ui:ui-unit:1.6.7 (c)
 ++--- androidx.compose.ui:ui-tooling-preview -> 1.6.7
 +|    \--- androidx.compose.ui:ui-tooling-preview-android:1.6.7
-+|         +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|         +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|         +--- androidx.compose.runtime:runtime:1.6.7 (*)
 +|         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 1.9.24 (*)
 +|         +--- androidx.compose.ui:ui:1.6.7 (c)
@@ -1072,12 +1079,12 @@
 +|    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*)
 +|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0 -> 1.9.24 (*)
 +|    |    +--- io.coil-kt:coil-base:2.6.0
-+|    |    |    +--- androidx.annotation:annotation:1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.7.1 -> 1.8.0 (*)
 +|    |    |    +--- androidx.appcompat:appcompat-resources:1.6.1 (*)
 +|    |    |    +--- androidx.collection:collection:1.4.0 (*)
 +|    |    |    +--- androidx.core:core-ktx:1.12.0 -> 1.13.0 (*)
 +|    |    |    +--- androidx.exifinterface:exifinterface:1.3.7
-+|    |    |    |    \--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |    |    |    \--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.profileinstaller:profileinstaller:1.3.1 (*)
 +|    |    |    +--- androidx.lifecycle:lifecycle-runtime:2.7.0 (*)
 +|    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 (*)

deps_googleplay.txt

@@ -1,6 +1,6 @@
 ++--- androidx.databinding:viewbinding:8.4.0
-+|    \--- androidx.annotation:annotation:1.0.0 -> 1.7.1
++|    \--- androidx.annotation:annotation:1.0.0 -> 1.8.0
-+|         \--- androidx.annotation:annotation-jvm:1.7.1
++|         \--- androidx.annotation:annotation-jvm:1.8.0
 +|              \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.9.24
 +|                   +--- org.jetbrains:annotations:13.0 -> 23.0.0
 +|                   +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0 -> 1.9.24 (c)
@@ -10,21 +10,21 @@
 ++--- androidx.databinding:databinding-runtime:8.4.0
 +|    +--- androidx.collection:collection:1.0.0 -> 1.4.0
 +|    |    \--- androidx.collection:collection-jvm:1.4.0
-+|    |         +--- androidx.annotation:annotation:1.7.0 -> 1.7.1 (*)
++|    |         +--- androidx.annotation:annotation:1.7.0 -> 1.8.0 (*)
 +|    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|    |         +--- androidx.collection:collection-ktx:1.4.0 (c)
 +|    |         \--- androidx.collection:collection-ktx:1.3.0 -> 1.4.0 (c)
 +|    +--- androidx.databinding:databinding-common:8.4.0
 +|    +--- androidx.databinding:viewbinding:8.4.0 (*)
 +|    \--- androidx.lifecycle:lifecycle-runtime:2.6.1 -> 2.7.0
-+|         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         +--- androidx.arch.core:core-common:2.2.0
-+|         |    \--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    \--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         +--- androidx.arch.core:core-runtime:2.2.0
-+|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    \--- androidx.arch.core:core-common:2.2.0 (*)
 +|         +--- androidx.lifecycle:lifecycle-common:2.7.0
-+|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.7.3
 +|         |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3
@@ -32,9 +32,9 @@
 +|         |    |    |         +--- org.jetbrains:annotations:23.0.0
 +|         |    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
 +|         |    |    |         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 (c)
++|         |    |    |         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 (c)
 +|         |    |    |         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (c)
-+|         |    |    |         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3 (c)
++|         |    |    |         |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3 (c)
-+|         |    |    |         |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 (c)
 +|         |    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 -> 1.9.24
 +|         |    |    |         |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.24 (*)
 +|         |    |    |         \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 -> 1.9.24
@@ -58,14 +58,14 @@
 +|         |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 (c)
 +|         |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 (c)
 +|         +--- androidx.profileinstaller:profileinstaller:1.3.0 -> 1.3.1
-+|         |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|         |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|         |    +--- androidx.concurrent:concurrent-futures:1.1.0
-+|         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    |    \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 +|         |    +--- androidx.startup:startup-runtime:1.1.1
-+|         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    |    \--- androidx.tracing:tracing:1.0.0
-+|         |    |         \--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    |         \--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 +|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|         +--- androidx.lifecycle:lifecycle-common:2.7.0 (c)
@@ -89,7 +89,7 @@
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20 -> 1.9.24 (*)
 +|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.7.3 (*)
 +|    +--- androidx.lifecycle:lifecycle-runtime-ktx:2.6.1 -> 2.7.0
-+|    |    +--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.7.0 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.7.3 (*)
@@ -159,7 +159,7 @@
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 (c)
 +|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 (c)
 +|    +--- androidx.lifecycle:lifecycle-process:2.6.1 -> 2.7.0
-+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.7.0 (*)
 +|    |    +--- androidx.startup:startup-runtime:1.1.1 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
@@ -193,7 +193,7 @@
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 (c)
 +|    |    \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0 (c)
 +|    \--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 -> 2.7.0
-+|         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|         +--- androidx.lifecycle:lifecycle-common:2.7.0 (c)
 +|         +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (c)
@@ -227,37 +227,37 @@
 +|    |    |    |    |    \--- com.google.android.gms:play-services-basement:18.3.0
 +|    |    |    |    |         +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
 +|    |    |    |    |         +--- androidx.core:core:1.2.0 -> 1.13.0
-+|    |    |    |    |         |    +--- androidx.annotation:annotation:1.6.0 -> 1.7.1 (*)
++|    |    |    |    |         |    +--- androidx.annotation:annotation:1.6.0 -> 1.8.0 (*)
-+|    |    |    |    |         |    +--- androidx.annotation:annotation-experimental:1.4.0
++|    |    |    |    |         |    +--- androidx.annotation:annotation-experimental:1.4.0 -> 1.4.1
 +|    |    |    |    |         |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.9.24 (*)
 +|    |    |    |    |         |    +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
 +|    |    |    |    |         |    +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0 (*)
 +|    |    |    |    |         |    +--- androidx.interpolator:interpolator:1.0.0
-+|    |    |    |    |         |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    |    |    |         |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    |    |    |         |    +--- androidx.lifecycle:lifecycle-runtime:2.6.2 -> 2.7.0 (*)
 +|    |    |    |    |         |    +--- androidx.versionedparcelable:versionedparcelable:1.1.1
-+|    |    |    |    |         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    |    |         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    |    |         |    |    \--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
 +|    |    |    |    |         |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|    |    |    |    |         |    \--- androidx.core:core-ktx:1.13.0 (c)
 +|    |    |    |    |         \--- androidx.fragment:fragment:1.1.0 -> 1.7.1
 +|    |    |    |    |              +--- androidx.activity:activity:1.8.1 -> 1.9.0
-+|    |    |    |    |              |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    |    |              |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    |    |              |    +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
 +|    |    |    |    |              |    +--- androidx.core:core:1.13.0 (*)
 +|    |    |    |    |              |    +--- androidx.lifecycle:lifecycle-runtime:2.6.1 -> 2.7.0 (*)
 +|    |    |    |    |              |    +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 -> 2.7.0 (*)
 +|    |    |    |    |              |    +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 -> 2.7.0
-+|    |    |    |    |              |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    |    |    |              |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    |    |    |              |    |    +--- androidx.core:core-ktx:1.2.0 -> 1.13.0
-+|    |    |    |    |              |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    |    |              |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    |    |              |    |    |    +--- androidx.core:core:1.13.0 (*)
 +|    |    |    |    |              |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|    |    |    |    |              |    |    |    \--- androidx.core:core:1.13.0 (c)
 +|    |    |    |    |              |    |    +--- androidx.lifecycle:lifecycle-livedata-core:2.7.0 (*)
 +|    |    |    |    |              |    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.7.0 (*)
 +|    |    |    |    |              |    |    +--- androidx.savedstate:savedstate:1.2.1
-+|    |    |    |    |              |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    |    |              |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    |    |              |    |    |    +--- androidx.arch.core:core-common:2.1.0 -> 2.2.0 (*)
 +|    |    |    |    |              |    |    |    +--- androidx.lifecycle:lifecycle-common:2.6.1 -> 2.7.0 (*)
 +|    |    |    |    |              |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.9.24 (*)
@@ -283,8 +283,8 @@
 +|    |    |    |    |              |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|    |    |    |    |              |    +--- androidx.activity:activity-compose:1.9.0 (c)
 +|    |    |    |    |              |    \--- androidx.activity:activity-ktx:1.9.0 (c)
-+|    |    |    |    |              +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    |    |              +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
-+|    |    |    |    |              +--- androidx.annotation:annotation-experimental:1.4.0 (*)
++|    |    |    |    |              +--- androidx.annotation:annotation-experimental:1.4.0 -> 1.4.1 (*)
 +|    |    |    |    |              +--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
 +|    |    |    |    |              +--- androidx.core:core-ktx:1.2.0 -> 1.13.0 (*)
 +|    |    |    |    |              +--- androidx.lifecycle:lifecycle-livedata-core:2.6.1 -> 2.7.0 (*)
@@ -292,17 +292,17 @@
 +|    |    |    |    |              +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 -> 2.7.0 (*)
 +|    |    |    |    |              +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 -> 2.7.0 (*)
 +|    |    |    |    |              +--- androidx.loader:loader:1.0.0
-+|    |    |    |    |              |    +--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    |    |    |              |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    |    |    |              |    +--- androidx.core:core:1.0.0 -> 1.13.0 (*)
 +|    |    |    |    |              |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.7.0 (*)
 +|    |    |    |    |              |    \--- androidx.lifecycle:lifecycle-viewmodel:2.0.0 -> 2.7.0 (*)
 +|    |    |    |    |              +--- androidx.profileinstaller:profileinstaller:1.3.1 (*)
 +|    |    |    |    |              +--- androidx.savedstate:savedstate:1.2.1 (*)
 +|    |    |    |    |              +--- androidx.viewpager:viewpager:1.0.0
-+|    |    |    |    |              |    +--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    |    |    |              |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    |    |    |              |    +--- androidx.core:core:1.0.0 -> 1.13.0 (*)
 +|    |    |    |    |              |    \--- androidx.customview:customview:1.0.0 -> 1.1.0
-+|    |    |    |    |              |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    |    |              |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    |    |              |         +--- androidx.core:core:1.3.0 -> 1.13.0 (*)
 +|    |    |    |    |              |         \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
 +|    |    |    |    |              +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
@@ -311,9 +311,9 @@
 +|    |    |    +--- com.google.firebase:firebase-components:18.0.0
 +|    |    |    |    +--- com.google.firebase:firebase-annotations:16.2.0
 +|    |    |    |    |    \--- javax.inject:javax.inject:1
-+|    |    |    |    \--- androidx.annotation:annotation:1.5.0 -> 1.7.1 (*)
++|    |    |    |    \--- androidx.annotation:annotation:1.5.0 -> 1.8.0 (*)
 +|    |    |    +--- com.google.firebase:firebase-annotations:16.2.0 (*)
-+|    |    |    +--- androidx.annotation:annotation:1.5.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.5.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.concurrent:concurrent-futures:1.1.0 (*)
 +|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|    |    |    +--- com.google.android.gms:play-services-basement:18.3.0 (*)
@@ -329,10 +329,10 @@
 +|    |    |    \--- com.google.firebase:firebase-annotations:16.2.0 (*)
 +|    |    +--- com.google.firebase:firebase-annotations:16.2.0 (*)
 +|    |    +--- com.google.firebase:firebase-encoders:17.0.0
-+|    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    +--- com.google.firebase:firebase-encoders-json:18.0.1
 +|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 -> 1.9.24 (*)
-+|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    \--- com.google.firebase:firebase-encoders:17.0.0 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.24 (*)
 +|    |    +--- com.google.firebase:firebase-installations:17.2.0 -> 18.0.0
@@ -345,37 +345,37 @@
 +|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|    |    +--- com.google.firebase:firebase-datatransport:18.1.8
 +|    |    |    +--- com.google.android.datatransport:transport-api:3.0.0
-+|    |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    +--- com.google.android.datatransport:transport-runtime:3.1.9
 +|    |    |    |    +--- com.google.android.datatransport:transport-api:3.0.0 (*)
-+|    |    |    |    +--- androidx.annotation:annotation:1.3.0 -> 1.7.1 (*)
++|    |    |    |    +--- androidx.annotation:annotation:1.3.0 -> 1.8.0 (*)
 +|    |    |    |    +--- javax.inject:javax.inject:1
 +|    |    |    |    +--- com.google.firebase:firebase-encoders:17.0.0 (*)
 +|    |    |    |    \--- com.google.firebase:firebase-encoders-proto:16.0.0
-+|    |    |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    |         \--- com.google.firebase:firebase-encoders:17.0.0 (*)
 +|    |    |    +--- com.google.android.datatransport:transport-backend-cct:3.1.9
 +|    |    |    |    +--- com.google.android.datatransport:transport-api:3.0.0 (*)
 +|    |    |    |    +--- com.google.android.datatransport:transport-runtime:3.1.8 -> 3.1.9 (*)
 +|    |    |    |    +--- com.google.firebase:firebase-encoders:17.0.0 (*)
 +|    |    |    |    +--- com.google.firebase:firebase-encoders-json:18.0.0 -> 18.0.1 (*)
-+|    |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
-+|    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    +--- androidx.datastore:datastore-preferences:1.0.0
 +|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 -> 1.9.24 (*)
 +|    |    |    +--- androidx.datastore:datastore:1.0.0
 +|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 -> 1.9.24 (*)
 +|    |    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0 -> 1.7.3 (*)
-+|    |    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    |    |    |    \--- androidx.datastore:datastore-core:1.0.0
 +|    |    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 -> 1.9.24 (*)
 +|    |    |    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0 -> 1.7.3 (*)
-+|    |    |    |         \--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    |         \--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    \--- androidx.datastore:datastore-preferences-core:1.0.0
 +|    |    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.10 -> 1.9.24 (*)
 +|    |    |         \--- androidx.datastore:datastore-core:1.0.0 (*)
 +|    |    +--- com.google.android.datatransport:transport-api:3.0.0 (*)
-+|    |    \--- androidx.annotation:annotation:1.5.0 -> 1.7.1 (*)
++|    |    \--- androidx.annotation:annotation:1.5.0 -> 1.8.0 (*)
 +|    +--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.1.0 (*)
 +|    +--- com.google.firebase:firebase-annotations:16.2.0 (*)
 +|    +--- com.google.firebase:firebase-common:21.0.0 (*)
@@ -395,20 +395,20 @@
 +|    +--- com.google.android.datatransport:transport-api:3.0.0 (*)
 +|    +--- com.google.android.datatransport:transport-backend-cct:3.1.9 (*)
 +|    +--- com.google.android.datatransport:transport-runtime:3.1.9 (*)
-+|    \--- androidx.annotation:annotation:1.5.0 -> 1.7.1 (*)
++|    \--- androidx.annotation:annotation:1.5.0 -> 1.8.0 (*)
 ++--- com.google.firebase:firebase-analytics -> 22.0.0
 +|    +--- com.google.android.gms:play-services-measurement:22.0.0
 +|    |    +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
 +|    |    +--- androidx.legacy:legacy-support-core-utils:1.0.0
-+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.core:core:1.0.0 -> 1.13.0 (*)
 +|    |    |    +--- androidx.documentfile:documentfile:1.0.0
-+|    |    |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.loader:loader:1.0.0 (*)
 +|    |    |    +--- androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
-+|    |    |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    |    \--- androidx.print:print:1.0.0
-+|    |    |         \--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    |         \--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    +--- com.google.android.gms:play-services-basement:18.3.0 (*)
 +|    |    +--- com.google.android.gms:play-services-measurement-base:22.0.0
 +|    |    |    \--- com.google.android.gms:play-services-basement:18.3.0 (*)
@@ -416,13 +416,13 @@
 +|    |    |    +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
 +|    |    |    +--- androidx.core:core:1.9.0 -> 1.13.0 (*)
 +|    |    |    +--- androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05
-+|    |    |    |    +--- androidx.annotation:annotation:1.6.0 -> 1.7.1 (*)
++|    |    |    |    +--- androidx.annotation:annotation:1.6.0 -> 1.8.0 (*)
 +|    |    |    |    +--- androidx.core:core-ktx:1.8.0 -> 1.13.0 (*)
 +|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.21 -> 1.9.24 (*)
 +|    |    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 -> 1.7.3 (*)
 +|    |    |    |    \--- androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05 (c)
 +|    |    |    +--- androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05
-+|    |    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    |    |    |    +--- androidx.concurrent:concurrent-futures:1.1.0 (*)
 +|    |    |    |    +--- androidx.core:core-ktx:1.8.0 -> 1.13.0 (*)
 +|    |    |    |    +--- androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05 (*)
@@ -475,7 +475,7 @@
 +|    |    +--- com.google.firebase:firebase-installations:17.2.0 -> 18.0.0 (*)
 +|    |    +--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.1.0 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
-+|    |    \--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    \--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    +--- com.google.firebase:firebase-common:21.0.0 (*)
 +|    +--- com.google.firebase:firebase-common-ktx:21.0.0 (*)
 +|    +--- com.google.firebase:firebase-installations:17.2.0 -> 18.0.0 (*)
@@ -521,13 +521,13 @@
 ++--- com.google.android.gms:play-services-oss-licenses:17.0.1
 +|    +--- androidx.appcompat:appcompat:1.0.0 -> 1.6.1
 +|    |    +--- androidx.activity:activity:1.6.0 -> 1.9.0 (*)
-+|    |    +--- androidx.annotation:annotation:1.3.0 -> 1.7.1 (*)
++|    |    +--- androidx.annotation:annotation:1.3.0 -> 1.8.0 (*)
 +|    |    +--- androidx.appcompat:appcompat-resources:1.6.1
-+|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
 +|    |    |    +--- androidx.core:core:1.6.0 -> 1.13.0 (*)
 +|    |    |    +--- androidx.vectordrawable:vectordrawable:1.1.0
-+|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    |    +--- androidx.core:core:1.1.0 -> 1.13.0 (*)
 +|    |    |    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
 +|    |    |    +--- androidx.vectordrawable:vectordrawable-animated:1.1.0
@@ -539,13 +539,13 @@
 +|    |    +--- androidx.core:core:1.9.0 -> 1.13.0 (*)
 +|    |    +--- androidx.core:core-ktx:1.8.0 -> 1.13.0 (*)
 +|    |    +--- androidx.cursoradapter:cursoradapter:1.0.0
-+|    |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    |    +--- androidx.drawerlayout:drawerlayout:1.0.0 -> 1.1.1
-+|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.core:core:1.2.0 -> 1.13.0 (*)
 +|    |    |    \--- androidx.customview:customview:1.1.0 (*)
 +|    |    +--- androidx.emoji2:emoji2:1.2.0 -> 1.3.0
-+|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
 +|    |    |    +--- androidx.core:core:1.3.0 -> 1.13.0 (*)
 +|    |    |    +--- androidx.lifecycle:lifecycle-process:2.4.1 -> 2.7.0 (*)
@@ -560,7 +560,7 @@
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.5.1 -> 2.7.0 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-viewmodel:2.5.1 -> 2.7.0 (*)
 +|    |    +--- androidx.resourceinspection:resourceinspection-annotation:1.0.1
-+|    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    \--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    +--- androidx.savedstate:savedstate:1.2.0 -> 1.2.1 (*)
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.9.24 (*)
 +|    |    \--- androidx.appcompat:appcompat-resources:1.6.1 (c)
@@ -574,48 +574,53 @@
 +|         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.24 (*)
 ++--- project :data
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.24 (*)
-+|    +--- androidx.room:room-ktx:2.6.1
++|    +--- androidx.room:room-runtime:2.7.0-alpha02
-+|    |    +--- androidx.room:room-common:2.6.1
++|    |    \--- androidx.room:room-runtime-android:2.7.0-alpha02
-+|    |    |    +--- androidx.annotation:annotation:1.3.0 -> 1.7.1 (*)
++|    |         +--- androidx.annotation:annotation:1.8.0 (*)
-+|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.24 (*)
++|    |         +--- androidx.annotation:annotation-experimental:1.4.1 (*)
-+|    |    |    +--- androidx.room:room-ktx:2.6.1 (c)
++|    |         +--- androidx.arch.core:core-runtime:2.2.0 (*)
-+|    |    |    \--- androidx.room:room-runtime:2.6.1 (c)
++|    |         +--- androidx.room:room-common:2.7.0-alpha02
-+|    |    +--- androidx.room:room-runtime:2.6.1
++|    |         |    \--- androidx.room:room-common-jvm:2.7.0-alpha02
-+|    |    |    +--- androidx.annotation:annotation-experimental:1.1.0-rc01 -> 1.4.0 (*)
++|    |         |         +--- androidx.annotation:annotation:1.8.0 (*)
-+|    |    |    +--- androidx.arch.core:core-runtime:2.2.0 (*)
++|    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
-+|    |    |    +--- androidx.room:room-common:2.6.1 (*)
++|    |         |         \--- androidx.room:room-runtime:2.7.0-alpha02 (c)
-+|    |    |    +--- androidx.sqlite:sqlite:2.4.0
++|    |         +--- androidx.sqlite:sqlite:2.5.0-alpha02
-+|    |    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |         |    \--- androidx.sqlite:sqlite-android:2.5.0-alpha02
-+|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
++|    |         |         +--- androidx.annotation:annotation:1.8.0 (*)
-+|    |    |    |    \--- androidx.sqlite:sqlite-framework:2.4.0 (c)
++|    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
-+|    |    |    +--- androidx.sqlite:sqlite-framework:2.4.0
++|    |         |         \--- androidx.sqlite:sqlite-framework:2.5.0-alpha02 (c)
-+|    |    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |         +--- androidx.sqlite:sqlite-framework:2.5.0-alpha02
-+|    |    |    |    +--- androidx.sqlite:sqlite:2.4.0 (*)
++|    |         |    \--- androidx.sqlite:sqlite-framework-android:2.5.0-alpha02
-+|    |    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
++|    |         |         +--- androidx.annotation:annotation:1.8.0 (*)
-+|    |    |    |    \--- androidx.sqlite:sqlite:2.4.0 (c)
++|    |         |         +--- androidx.sqlite:sqlite:2.5.0-alpha02 (*)
-+|    |    |    +--- androidx.room:room-common:2.6.1 (c)
++|    |         |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
-+|    |    |    \--- androidx.room:room-ktx:2.6.1 (c)
++|    |         |         \--- androidx.sqlite:sqlite:2.5.0-alpha02 (c)
 +|    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
-+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.7.3 (*)
++|    |         +--- org.jetbrains.kotlinx:atomicfu:0.17.0
-+|    |    +--- androidx.room:room-common:2.6.1 (c)
++|    |         |    \--- org.jetbrains.kotlinx:atomicfu-jvm:0.17.0
-+|    |    \--- androidx.room:room-runtime:2.6.1 (c)
++|    |         |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.0 -> 1.9.24 (*)
++|    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 (*)
++|    |         +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 (*)
++|    |         \--- androidx.room:room-common:2.7.0-alpha02 (c)
 +|    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3
 +|    |    \--- org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3
 +|    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 1.9.24 (*)
 +|    |         +--- org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3
-+|    |         |    +--- org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3 (c)
 +|    |         |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3 (c)
 +|    |         |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3 (c)
++|    |         |    +--- org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3 (c)
 +|    |         |    \--- org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3 (c)
-+|    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22 -> 1.9.24 (*)
 +|    |         \--- org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3
 +|    |              \--- org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3
 +|    |                   +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 1.9.24 (*)
 +|    |                   +--- org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3 (*)
 +|    |                   \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22 -> 1.9.24 (*)
-+|    +--- com.jakewharton.timber:timber:5.0.1
++|    +--- co.touchlab:kermit:2.0.3
-+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.9.24 (*)
++|    |    \--- co.touchlab:kermit-android:2.0.3
-+|    |    \--- org.jetbrains:annotations:20.1.0 -> 23.0.0
++|    |         +--- co.touchlab:kermit-core:2.0.3
++|    |         |    \--- co.touchlab:kermit-core-android:2.0.3
++|    |         |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 1.9.24 (*)
++|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 1.9.24 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.24 (*)
 ++--- com.github.bitfireAT:dav4jvm:2.2.1
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20 -> 1.9.24 (*)
@@ -659,7 +664,7 @@
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -> 1.9.24 (*)
 +|    +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.1 (*)
 +|    +--- androidx.cardview:cardview:1.0.0
-+|    |    \--- androidx.annotation:annotation:1.0.0 -> 1.7.1 (*)
++|    |    \--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
 +|    +--- androidx.lifecycle:lifecycle-extensions:2.2.0
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.7.0 (*)
 +|    |    +--- androidx.arch.core:core-common:2.1.0 -> 2.2.0 (*)
@@ -712,11 +717,11 @@
 +|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 -> 1.9.24 (c)
 +|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 1.9.24 (c)
 +|    |    +--- androidx.activity:activity:1.8.0 -> 1.9.0 (*)
-+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    |    +--- androidx.appcompat:appcompat:1.6.1 (*)
 +|    |    +--- androidx.cardview:cardview:1.0.0 (*)
 +|    |    +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0
-+|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.core:core:1.1.0 -> 1.13.0 (*)
 +|    |    |    +--- androidx.customview:customview:1.0.0 -> 1.1.0 (*)
 +|    |    |    \--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
@@ -730,11 +735,11 @@
 +|    |    |    +--- androidx.core:core:1.0.0 -> 1.13.0 (*)
 +|    |    |    +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
 +|    |    |    \--- androidx.legacy:legacy-support-core-utils:1.0.0 (*)
-+|    |    +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.4.0 (*)
++|    |    +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.4.1 (*)
 +|    |    +--- androidx.fragment:fragment:1.2.5 -> 1.7.1 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.7.0 (*)
 +|    |    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2
-+|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
 +|    |    |    +--- androidx.core:core:1.7.0 -> 1.13.0 (*)
 +|    |    |    +--- androidx.customview:customview:1.0.0 -> 1.1.0 (*)
@@ -744,14 +749,14 @@
 +|    |    |    \--- androidx.viewpager2:viewpager2:1.1.0-beta02 (c)
 +|    |    +--- androidx.resourceinspection:resourceinspection-annotation:1.0.1 (*)
 +|    |    +--- androidx.transition:transition:1.5.0
-+|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
 +|    |    |    +--- androidx.core:core:1.13.0 (*)
 +|    |    |    \--- androidx.dynamicanimation:dynamicanimation:1.0.0 (*)
 +|    |    +--- androidx.vectordrawable:vectordrawable:1.1.0 (*)
 +|    |    \--- androidx.viewpager2:viewpager2:1.0.0 -> 1.1.0-beta02
-+|    |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
-+|    |         +--- androidx.annotation:annotation-experimental:1.3.0 -> 1.4.0 (*)
++|    |         +--- androidx.annotation:annotation-experimental:1.3.0 -> 1.4.1 (*)
 +|    |         +--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
 +|    |         +--- androidx.core:core:1.3.2 -> 1.13.0 (*)
 +|    |         +--- androidx.fragment:fragment:1.1.0 -> 1.7.1 (*)
@@ -770,8 +775,8 @@
 +|    |    +--- com.google.dagger:dagger:2.50 (*)
 +|    |    \--- javax.inject:javax.inject:1
 +|    +--- androidx.activity:activity:1.5.1 -> 1.9.0 (*)
-+|    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
-+|    +--- androidx.annotation:annotation-experimental:1.3.1 -> 1.4.0 (*)
++|    +--- androidx.annotation:annotation-experimental:1.3.1 -> 1.4.1 (*)
 +|    +--- androidx.fragment:fragment:1.5.1 -> 1.7.1 (*)
 +|    +--- androidx.lifecycle:lifecycle-common:2.5.1 -> 2.7.0 (*)
 +|    +--- androidx.lifecycle:lifecycle-viewmodel:2.5.1 -> 2.7.0 (*)
@@ -780,17 +785,17 @@
 +|    +--- javax.inject:javax.inject:1
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.20 -> 1.9.24 (*)
 ++--- androidx.hilt:hilt-work:1.2.0
-+|    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    +--- androidx.hilt:hilt-common:1.2.0
 +|    |    \--- com.google.dagger:hilt-core:2.49 -> 2.50 (*)
 +|    +--- androidx.work:work-runtime:2.3.4 -> 2.8.1
-+|    |    +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.4.0 (*)
++|    |    +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.4.1 (*)
 +|    |    +--- androidx.core:core:1.1.0 -> 1.13.0 (*)
 +|    |    +--- androidx.core:core:1.6.0 -> 1.13.0 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.7.0 (*)
 +|    |    +--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.7.0 (*)
-+|    |    +--- androidx.room:room-runtime:2.5.0 -> 2.6.1 (*)
++|    |    +--- androidx.room:room-runtime:2.5.0 -> 2.7.0-alpha02 (*)
-+|    |    +--- androidx.sqlite:sqlite-framework:2.3.0 -> 2.4.0 (*)
++|    |    +--- androidx.sqlite:sqlite-framework:2.3.0 -> 2.5.0-alpha02 (*)
 +|    |    +--- androidx.startup:startup-runtime:1.0.0 -> 1.1.1 (*)
 +|    |    +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 +|    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 1.9.24 (*)
@@ -820,10 +825,10 @@
 +|    \--- androidx.fragment:fragment:1.7.1 (c)
 ++--- androidx.lifecycle:lifecycle-runtime-ktx:2.7.0 (*)
 ++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0 (*)
-++--- androidx.room:room-ktx:2.6.1 (*)
+++--- androidx.room:room-runtime:2.7.0-alpha02 (*)
 ++--- androidx.appcompat:appcompat:1.6.1 (*)
 ++--- io.noties.markwon:core:4.6.2
-+|    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    \--- com.atlassian.commonmark:commonmark:0.13.0
 ++--- io.noties.markwon:editor:4.6.2
 +|    \--- io.noties.markwon:core:4.6.2 (*)
@@ -863,7 +868,7 @@
 +|         |    |         \--- androidx.compose.runtime:runtime-saveable:1.6.7 (c)
 +|         |    +--- androidx.compose.runtime:runtime-saveable:1.0.1 -> 1.6.7
 +|         |    |    \--- androidx.compose.runtime:runtime-saveable-android:1.6.7
-+|         |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    |         +--- androidx.compose.runtime:runtime:1.6.7 (*)
 +|         |    |         +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|         |    |         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 1.9.24 (*)
@@ -872,7 +877,7 @@
 +|         |    +--- androidx.compose.ui:ui:1.0.1 -> 1.6.7
 +|         |    |    \--- androidx.compose.ui:ui-android:1.6.7
 +|         |    |         +--- androidx.activity:activity-ktx:1.7.0 -> 1.9.0 (*)
-+|         |    |         +--- androidx.annotation:annotation:1.6.0 -> 1.7.1 (*)
++|         |    |         +--- androidx.annotation:annotation:1.6.0 -> 1.8.0 (*)
 +|         |    |         +--- androidx.autofill:autofill:1.0.0
 +|         |    |         |    \--- androidx.core:core:1.1.0 -> 1.13.0 (*)
 +|         |    |         +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
@@ -881,7 +886,7 @@
 +|         |    |         +--- androidx.compose.runtime:runtime-saveable:1.6.7 (*)
 +|         |    |         +--- androidx.compose.ui:ui-geometry:1.6.7
 +|         |    |         |    \--- androidx.compose.ui:ui-geometry-android:1.6.7
-+|         |    |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    |         |         +--- androidx.compose.runtime:runtime:1.2.1 -> 1.6.7 (*)
 +|         |    |         |         +--- androidx.compose.ui:ui-util:1.6.7
 +|         |    |         |         |    \--- androidx.compose.ui:ui-util-android:1.6.7
@@ -905,12 +910,12 @@
 +|         |    |         |         \--- androidx.compose.ui:ui-viewbinding:1.6.7 (c)
 +|         |    |         +--- androidx.compose.ui:ui-graphics:1.6.7
 +|         |    |         |    \--- androidx.compose.ui:ui-graphics-android:1.6.7
-+|         |    |         |         +--- androidx.annotation:annotation:1.7.0 -> 1.7.1 (*)
++|         |    |         |         +--- androidx.annotation:annotation:1.7.0 -> 1.8.0 (*)
 +|         |    |         |         +--- androidx.collection:collection:1.4.0 (*)
 +|         |    |         |         +--- androidx.compose.runtime:runtime:1.6.7 (*)
 +|         |    |         |         +--- androidx.compose.ui:ui-unit:1.6.7
 +|         |    |         |         |    \--- androidx.compose.ui:ui-unit-android:1.6.7
-+|         |    |         |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    |         |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    |         |         |         +--- androidx.collection:collection-ktx:1.2.0 -> 1.4.0 (*)
 +|         |    |         |         |         +--- androidx.compose.runtime:runtime:1.6.7 (*)
 +|         |    |         |         |         +--- androidx.compose.ui:ui-geometry:1.6.7 (*)
@@ -935,7 +940,7 @@
 +|         |    |         |         \--- androidx.compose.ui:ui-viewbinding:1.6.7 (c)
 +|         |    |         +--- androidx.compose.ui:ui-text:1.6.7
 +|         |    |         |    \--- androidx.compose.ui:ui-text-android:1.6.7
-+|         |    |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    |         |         +--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
 +|         |    |         |         +--- androidx.compose.runtime:runtime:1.6.7 (*)
 +|         |    |         |         +--- androidx.compose.runtime:runtime-saveable:1.6.7 (*)
@@ -979,12 +984,12 @@
 +|         |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.24 (*)
 +|         |    +--- androidx.activity:activity:1.9.0 (c)
 +|         |    \--- androidx.activity:activity-ktx:1.9.0 (c)
-+|         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
-+|         +--- androidx.annotation:annotation-experimental:1.4.0 (*)
++|         +--- androidx.annotation:annotation-experimental:1.4.0 -> 1.4.1 (*)
 +|         +--- androidx.collection:collection:1.4.0 (*)
 +|         +--- androidx.compose.animation:animation-core:1.6.0 -> 1.6.7
 +|         |    \--- androidx.compose.animation:animation-core-android:1.6.7
-+|         |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |         +--- androidx.collection:collection:1.4.0 (*)
 +|         |         +--- androidx.compose.runtime:runtime:1.6.7 (*)
 +|         |         +--- androidx.compose.ui:ui:1.6.7 (*)
@@ -996,15 +1001,15 @@
 +|         |         \--- androidx.compose.animation:animation:1.6.7 (c)
 +|         +--- androidx.compose.foundation:foundation:1.6.0 -> 1.6.7
 +|         |    \--- androidx.compose.foundation:foundation-android:1.6.7
-+|         |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |         +--- androidx.collection:collection:1.4.0 (*)
 +|         |         +--- androidx.compose.animation:animation:1.6.7
 +|         |         |    \--- androidx.compose.animation:animation-android:1.6.7
-+|         |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |         |         +--- androidx.compose.animation:animation-core:1.6.7 (*)
 +|         |         |         +--- androidx.compose.foundation:foundation-layout:1.6.7
 +|         |         |         |    \--- androidx.compose.foundation:foundation-layout-android:1.6.7
-+|         |         |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |         |         |         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |         |         |         +--- androidx.compose.animation:animation-core:1.2.1 -> 1.6.7 (*)
 +|         |         |         |         +--- androidx.compose.runtime:runtime:1.6.7 (*)
 +|         |         |         |         +--- androidx.compose.ui:ui:1.6.7 (*)
@@ -1051,7 +1056,7 @@
 +|         +--- androidx.compose.ui:ui-text:1.6.0 -> 1.6.7 (*)
 +|         +--- androidx.compose.ui:ui-util:1.6.0 -> 1.6.7 (*)
 +|         +--- androidx.lifecycle:lifecycle-common-java8:2.6.1 -> 2.7.0
-+|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         |    +--- androidx.lifecycle:lifecycle-common:2.7.0 (*)
 +|         |    +--- androidx.lifecycle:lifecycle-common:2.7.0 (c)
 +|         |    +--- androidx.lifecycle:lifecycle-livedata:2.7.0 (c)
@@ -1072,29 +1077,31 @@
 +|         \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 1.9.24 (*)
 ++--- androidx.constraintlayout:constraintlayout:2.1.4 (*)
 ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
-+|    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    +--- androidx.core:core:1.1.0 -> 1.13.0 (*)
 +|    \--- androidx.interpolator:interpolator:1.0.0 (*)
 ++--- androidx.preference:preference:1.2.1
-+|    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    +--- androidx.appcompat:appcompat:1.1.0 -> 1.6.1 (*)
 +|    +--- androidx.core:core:1.6.0 -> 1.13.0 (*)
 +|    +--- androidx.activity:activity-ktx:1.5.1 -> 1.9.0 (*)
 +|    +--- androidx.fragment:fragment-ktx:1.3.6 -> 1.7.1 (*)
 +|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
 +|    +--- androidx.slidingpanelayout:slidingpanelayout:1.2.0
-+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    |    +--- androidx.customview:customview:1.1.0 (*)
 +|    |    +--- androidx.core:core:1.1.0 -> 1.13.0 (*)
 +|    |    +--- androidx.window:window:1.0.0
 +|    |    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.0 -> 1.9.24 (*)
 +|    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.7.3 (*)
-+|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
 +|    |    |    \--- androidx.core:core:1.3.2 -> 1.13.0 (*)
 +|    |    \--- androidx.transition:transition:1.4.1 -> 1.5.0 (*)
 +|    \--- androidx.collection:collection:1.0.0 -> 1.4.0 (*)
-++--- com.jakewharton.timber:timber:5.0.1 (*)
+++--- com.jakewharton.timber:timber:5.0.1
++|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.21 -> 1.9.24 (*)
++|    \--- org.jetbrains:annotations:20.1.0 -> 23.0.0
 ++--- com.google.android.apps.dashclock:dashclock-api:2.0.0
 ++--- com.github.twofortyfouram:android-plugin-api-for-locale:1.0.2
 ++--- com.rubiconproject.oss:jchronic:0.2.6
@@ -1134,20 +1141,20 @@
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 1.9.24 (*)
 +|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*)
 ++--- com.etebase:client:2.3.2
-+|    +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|    \--- com.squareup.okhttp3:logging-interceptor:3.12.1
 +|         \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.12.0 (*)
 ++--- com.github.QuadFlask:colorpicker:0.0.15
 +|    \--- androidx.appcompat:appcompat:1.1.0 -> 1.6.1 (*)
 ++--- net.openid:appauth:0.11.1
-+|    +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    +--- androidx.appcompat:appcompat:1.3.0 -> 1.6.1 (*)
 +|    \--- androidx.browser:browser:1.3.0
 +|         +--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
 +|         +--- androidx.concurrent:concurrent-futures:1.0.0 -> 1.1.0 (*)
 +|         +--- androidx.interpolator:interpolator:1.0.0 (*)
 +|         +--- androidx.core:core:1.1.0 -> 1.13.0 (*)
-+|         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
 ++--- org.osmdroid:osmdroid-android:6.1.18
 ++--- com.squareup.retrofit2:retrofit:2.9.0
@@ -1200,7 +1207,7 @@
 ++--- androidx.compose.foundation:foundation -> 1.6.7 (*)
 ++--- androidx.compose.material:material -> 1.6.7
 +|    \--- androidx.compose.material:material-android:1.6.7
-+|         +--- androidx.annotation:annotation:1.1.0 -> 1.7.1 (*)
++|         +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
 +|         +--- androidx.compose.animation:animation:1.6.7 (*)
 +|         +--- androidx.compose.animation:animation-core:1.6.7 (*)
 +|         +--- androidx.compose.foundation:foundation:1.6.7 (*)
@@ -1246,7 +1253,7 @@
 +|         +--- androidx.compose.material:material-icons-core:1.6.7 (c)
 +|         \--- androidx.compose.material:material-ripple:1.6.7 (c)
 ++--- androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0
-+|    +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.4.0 (*)
++|    +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.4.1 (*)
 +|    +--- androidx.compose.runtime:runtime:1.0.1 -> 1.6.7 (*)
 +|    +--- androidx.compose.ui:ui:1.0.1 -> 1.6.7 (*)
 +|    +--- androidx.lifecycle:lifecycle-common-java8:2.7.0 (*)
@@ -1281,7 +1288,7 @@
 +|    \--- androidx.compose.ui:ui-unit:1.6.7 (c)
 ++--- androidx.compose.ui:ui-tooling-preview -> 1.6.7
 +|    \--- androidx.compose.ui:ui-tooling-preview-android:1.6.7
-+|         +--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|         +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|         +--- androidx.compose.runtime:runtime:1.6.7 (*)
 +|         +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 -> 1.9.24 (*)
 +|         +--- androidx.compose.ui:ui:1.6.7 (c)
@@ -1299,12 +1306,12 @@
 +|    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.7.3 (*)
 +|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0 -> 1.9.24 (*)
 +|    |    +--- io.coil-kt:coil-base:2.6.0
-+|    |    |    +--- androidx.annotation:annotation:1.7.1 (*)
++|    |    |    +--- androidx.annotation:annotation:1.7.1 -> 1.8.0 (*)
 +|    |    |    +--- androidx.appcompat:appcompat-resources:1.6.1 (*)
 +|    |    |    +--- androidx.collection:collection:1.4.0 (*)
 +|    |    |    +--- androidx.core:core-ktx:1.12.0 -> 1.13.0 (*)
 +|    |    |    +--- androidx.exifinterface:exifinterface:1.3.7
-+|    |    |    |    \--- androidx.annotation:annotation:1.2.0 -> 1.7.1 (*)
++|    |    |    |    \--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
 +|    |    |    +--- androidx.profileinstaller:profileinstaller:1.3.1 (*)
 +|    |    |    +--- androidx.lifecycle:lifecycle-runtime:2.7.0 (*)
 +|    |    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 (*)

gradle/libs.versions.toml

@@ -23,7 +23,7 @@ google-oauth2 = "1.20.0"
 google-api-drive = "v3-rev20240327-2.0.0"
 google-api-tasks = "v1-rev20240423-2.0.0"
 google-services = "4.4.1"
-gradle = "8.4.0"
+agp = "8.4.0"
 hilt = "1.2.0"
 ical4android = "12fe73a"
 jchronic = "0.2.6"
@@ -54,7 +54,7 @@ preference = "1.2.1"
 recyclerview = "1.3.2"
 retrofit = "2.9.0"
 rfc5545-datetime = "0.2.4"
-room = "2.6.1"
+room = "2.7.0-alpha02"
 shortcut-badger = "1.1.22"
 soloader = "0.11.0"
 timber = "5.0.1"
@@ -77,13 +77,12 @@ androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref
 androidx-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hilt" }
 androidx-hilt-work = { module = "androidx.hilt:hilt-work", version.ref = "hilt" }
 androidx-junit = { module = "androidx.test.ext:junit", version.ref = "junit" }
-androidx-lifecycle-livedata = { group = "androidx.lifecycle", name = "lifecycle-livedata-core-ktx", version.ref = "lifecycle" }
 androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
 androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
 androidx-preference = { module = "androidx.preference:preference", version.ref = "preference" }
 androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
-androidx-room = { module = "androidx.room:room-ktx", version.ref = "room" }
+androidx-room = { module = "androidx.room:room-runtime", version.ref = "room" }
 androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room"}
 androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" }
 androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test" }
@@ -121,9 +120,10 @@ google-oauth2 = { module = "com.google.auth:google-auth-library-oauth2-http", ve
 google-api-drive = { module = "com.google.apis:google-api-services-drive", version.ref = "google-api-drive" }
 google-api-tasks = { module = "com.google.apis:google-api-services-tasks", version.ref = "google-api-tasks" }
 google-services = { module = "com.google.gms:google-services", version.ref = "google-services" }
-gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
+gradle = { module = "com.android.tools.build:gradle", version.ref = "agp" }
 jchronic = { module = "com.rubiconproject.oss:jchronic", version.ref = "jchronic" }
 junit = { module = "junit:junit", version.ref = "junit-junit" }
+kermit = { module = "co.touchlab:kermit", version = "2.0.3" }
 kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.3.7" }
 kotlin-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
@@ -158,3 +158,7 @@ retrofit-moshi = { module = "com.squareup.retrofit2:converter-moshi", version.re
 shortcut-badger = { module = "me.leolin:ShortcutBadger", version.ref = "shortcut-badger" }
 timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
 xpp3 = { module = "org.ogce:xpp3", version.ref = "xpp3" }
+
+[plugins]
+androidLibrary = { id = "com.android.library", version.ref = "agp" }
+kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

settings.gradle.kts

@@ -1,2 +1,17 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
 include("app")
 include("data")