Dependency bumps

app/android/shared/build.gradle.kts

@@ -21,17 +21,6 @@ dependencies {
 android {
     namespace = "dev.schlaubi.tonbrett.app.android.shared"
     compileSdk = sdkInt
-
-    // For some reason java 9+ sources do some jlink nonsense which causes major problems for this project
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
 }
 
 protobuf {

app/android/src/main/java/UpdateAwareAppScope.kt

@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.OpenInNew
 import androidx.compose.material.icons.filled.OpenInNew
 import androidx.compose.material3.Button
 import androidx.compose.material3.Icon
@@ -120,7 +121,7 @@ fun UpdateAwareAppScope(activity: Activity, content: @Composable () -> Unit) {
                             appUpdateManager.requestCompleteUpdate()
                         }
                     }) {
-                        Icon(Icons.Default.OpenInNew, null)
+                        Icon(Icons.AutoMirrored.Default.OpenInNew, null)
                         Info(stringResource(R.string.update_download_done))
                     }
 

app/desktop/src/commonMain/kotlin/AuthorizationScreen.kt

@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.OpenInNew
 import androidx.compose.material.icons.filled.OpenInNew
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
@@ -42,7 +43,7 @@ fun AuthorizationScreen(alreadyWaiting: Boolean, onAuth: () -> Unit) {
             CircularProgressIndicator()
         } else {
             Button({ waiting = true }, contentPadding = PaddingValues(horizontal = 10.dp)) {
-                Icon(Icons.Default.OpenInNew, null)
+                Icon(Icons.AutoMirrored.Default.OpenInNew, null)
                 Text(strings.signInWithDiscord)
             }
         }

app/desktop/src/commonMain/kotlin/Main.kt

@@ -23,7 +23,7 @@ import cafe.adriel.lyricist.LocalStrings
 import dev.schlaubi.tonbrett.app.*
 import dev.schlaubi.tonbrett.app.api.ProvideContext
 import io.ktor.serialization.*
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.net.URI
 import java.awt.Window as AWTWindow
 

app/desktop/src/windowsMain/kotlin/Platform.kt

@@ -9,7 +9,7 @@ import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.lang.foreign.Arena
 import java.lang.foreign.MemorySegment
 import java.lang.foreign.SegmentAllocator

app/shared/src/commonMain/kotlin/ImageLoader.kt

@@ -16,7 +16,7 @@ import coil3.network.ktor.KtorNetworkFetcherFactory
 import coil3.request.ImageRequest
 import coil3.request.crossfade
 import dev.schlaubi.tonbrett.app.api.AppContext
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import okio.Path
 
 private val LOG = KotlinLogging.logger { }

app/shared/src/commonMain/kotlin/TonbrettApp.kt

@@ -28,7 +28,7 @@ import dev.schlaubi.tonbrett.common.User
 import io.ktor.client.plugins.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 
 typealias ErrorReporter = suspend (Exception) -> Unit
 

app/shared/src/commonMain/kotlin/components/SoundList.kt

@@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 
 private val LOG = KotlinLogging.logger {}
 

app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/AuthorizationScreen.kt

@@ -33,7 +33,7 @@ import io.ktor.client.fetch.*
 import kotlinx.browser.window
 import kotlinx.coroutines.await
 import kotlinx.coroutines.delay
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import org.w3c.dom.url.URLSearchParams
 import kotlin.time.Duration.Companion.seconds
 

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 
 allprojects {
     group = "dev.schlaubi.tonbrett"
-    version = "1.18.17"
+    version = "1.18.18"
 
     repositories {
         mavenCentral()

buildSrc/src/main/kotlin/VersionCatalogs.kt

@@ -1,3 +1,3 @@
-import org.gradle.api.artifacts.MinimalExternalModuleDependency
+import org.gradle.api.artifacts.Dependency
 
-fun MinimalExternalModuleDependency.toNotation() = "$group:$name:$version"
+fun Dependency.toNotation() = "$group:$name:$version"

client/src/commonMain/kotlin/Tonbrett.kt

@@ -23,7 +23,7 @@ import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.serialization.json.Json
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 
 private val LOG = KotlinLogging.logger { }
 

client/src/commonMain/kotlin/WebSocketRetry.kt

@@ -10,7 +10,7 @@ import io.ktor.client.request.*
 import io.ktor.utils.io.core.*
 import io.ktor.websocket.*
 import kotlinx.coroutines.channels.ClosedReceiveChannelException
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 

gradle/libs.versions.toml

@@ -7,19 +7,19 @@ mikbot = "3.29.0"
 ksp = "2.0.0-Beta4-1.0.17"
 kordex = "1.7.1-SNAPSHOT"
 android = "8.2.2"
-compose = "1.6.0-dev1440"
+compose = "1.6.0"
 compose-wear = "1.3.0"
 lyricist = "1.6.2"
 google-play = "2.1.0"
-coroutines = "1.7.3"
+coroutines = "1.8.0"
 play-services-wearable = "18.1.0"
-horologist = "0.5.10"
-protobuf = "3.19.4"
+horologist = "0.6.2"
+protobuf = "3.25.3"
 compose-compiler = "1.5.11-dev-k2.0.0-Beta4-21f5e479a96"
 coil = "3.0.0-alpha04"
 
 [libraries]
-kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.6.2" }
+kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.6.3" }
 kmongo-id-serialization = { group = "org.litote.kmongo", name = "kmongo-id-serialization", version.ref = "kmongo" }
 kmongo-serialization = { group = "org.litote.kmongo", name = "kmongo-serialization", version.ref = "kmongo" }
 kord-common = { group = "dev.kord", name = "kord-common", version.ref = "kord" }
@@ -52,16 +52,14 @@ ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serializatio
 mikbot-ktor = { group = "dev.schlaubi", name = "mikbot-ktor", version.ref = "mikbot" }
 mikbot-music = { group = "dev.schlaubi", name = "mikbot-music-player", version = "3.3.0-SNAPSHOT" }
 
-imageloader = { group = "io.github.qdsfdhvh", name = "image-loader", version = "1.6.7" }
-
-kotlin-logging = { group = "io.github.microutils", name = "kotlin-logging", version = "3.0.5" }
+kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "6.0.3" }
 
 lyricist = { group = "cafe.adriel.lyricist", name = "lyricist", version.ref = "lyricist" }
 lyricist-processor = { group = "cafe.adriel.lyricist", name = "lyricist-processor", version.ref = "lyricist" }
 
-logback = { group = "ch.qos.logback", name = "logback-classic", version = "1.4.11" }
+logback = { group = "ch.qos.logback", name = "logback-classic", version = "1.4.14" }
 
-kvault = { group = "com.liftric", name = "kvault", version = "1.10.0" }
+kvault = { group = "com.liftric", name = "kvault", version = "1.12.0" }
 
 androidx-activity = { group = "androidx.activity", name = "activity-compose", version = "1.8.2" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.6.1" }
@@ -75,8 +73,8 @@ google-artifactregistry = { group = "gradle.plugin.com.google.cloud.artifactregi
 play-services-wearable = { group = "com.google.android.gms", name = "play-services-wearable", version.ref = "play-services-wearable" }
 
 protoc = { group = "com.google.protobuf", name = "protoc", version.ref = "protobuf" }
-protobuf-javalite = { group = "com.google.protobuf", name = "protobuf-javalite", version = "3.25.0" }
-protobuf-kotlin-lite = { group = "com.google.protobuf", name = "protobuf-kotlin-lite", version = "3.25.0" }
+protobuf-javalite = { group = "com.google.protobuf", name = "protobuf-javalite", version.ref = "protobuf" }
+protobuf-kotlin-lite = { group = "com.google.protobuf", name = "protobuf-kotlin-lite", version.ref = "protobuf" }
 
 androidx-wear-compose-material = { group = "androidx.wear.compose", name = "compose-material", version.ref = "compose-wear" }
 androidx-wear-compose-foundation = { group = "androidx.wear.compose", name = "compose-foundation", version.ref = "compose-wear" }
@@ -104,5 +102,5 @@ android-base = { id = "com.android.base", version.ref = "android" }
 android-application = { id = "com.android.application", version.ref = "android" }
 android-library = { id = "com.android.library", version.ref = "android" }
 compose = { id = "org.jetbrains.compose", version.ref = "compose" }
-buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.1.0" }
+buildconfig = { id = "com.github.gmazzo.buildconfig", version = "5.3.3" }
 protobuf = { id = "com.google.protobuf", version = "0.9.4" }