From 402086266bb4fd7c236153821043329a6e07111c Mon Sep 17 00:00:00 2001
From: Michael Rittmeister <michael@rittmeister.in>
Date: Sat, 26 Oct 2024 00:17:23 +0200
Subject: [PATCH] Upgrades - Update kotlin to 2.0.21 - Update ktor to 3.0.0 -
 Update mikbot to 3.37.19 - Update ksp to 2.0.21-1.0.26 - Update kordex to
 1.9.12-mikbot-SNAPSHOT - Update AGP to 8.7.1 - Update compose to 1.7.0 -
 Update horologist to 0.7.3-alpha - Update protobuf to 4.28.3 - Update coil to
 3.0.0-rc01 - Update mikbot-music-player to 3.12.0-SNAPSHOT - Update logback
 to 1.5.11 - Update activity-compose to 1.9.3 - Update androidx-core-ktx to
 1.15.0-rc01 - Switch coil-network-ktor2 to coil-network-ktor3 - Register
 Discord Activity Entry point

---
 .../{other.xml => caches/deviceStreaming.xml} |  57 +++++++--
 .idea/gradle.xml                              |   1 +
 .idea/kotlinc.xml                             |   2 +-
 .idea/runConfigurations.xml                   |  17 +++
 app/android/build.gradle.kts                  |   4 -
 .../src/main/java/UpdateAwareAppScope.kt      |   1 -
 app/desktop/rules.pro                         |   2 +-
 .../kotlin/AuthorizationServer.kt             |   4 +-
 app/desktop/uwp_helper/Cargo.lock             | 113 ++++++++----------
 .../src/commonMain/kotlin/ImageLoader.kt      |   4 +-
 bot/build.gradle.kts                          |   2 +-
 .../dev/schlaubi/tonbrett/bot/Plugin.kt       |   9 ++
 .../tonbrett/bot/server/Authentication.kt     |   3 +-
 .../tonbrett/bot/server/FileServer.kt         |   2 +-
 .../dev/schlaubi/tonbrett/bot/server/Ktor.kt  |   2 +-
 .../dev/schlaubi/tonbrett/bot/server/Ui.kt    |  22 +++-
 .../schlaubi/tonbrett/bot/server/WebSocket.kt |   3 +-
 .../soundboard/strings_de_DE.properties       |   1 +
 .../soundboard/strings_en_GB.properties       |   1 +
 buildSrc/src/main/kotlin/Android.kt           |   2 +-
 client/src/commonMain/kotlin/Tonbrett.kt      |  15 +--
 .../src/commonMain/kotlin/WebSocketRetry.kt   |  21 ++--
 gradle/libs.versions.toml                     |  30 ++---
 23 files changed, 187 insertions(+), 131 deletions(-)
 rename .idea/{other.xml => caches/deviceStreaming.xml} (87%)
 create mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/other.xml b/.idea/caches/deviceStreaming.xml
similarity index 87%
rename from .idea/other.xml
rename to .idea/caches/deviceStreaming.xml
index 1b1a2c59..5a2f8669 100644
--- a/.idea/other.xml
+++ b/.idea/caches/deviceStreaming.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="direct_access_persist.xml">
+  <component name="DeviceStreaming">
     <option name="deviceSelectionList">
       <list>
         <PersistentDeviceSelectionData>
@@ -25,6 +25,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2160" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="Lenovo" />
+          <option name="codename" value="TB370FU" />
+          <option name="id" value="TB370FU" />
+          <option name="manufacturer" value="Lenovo" />
+          <option name="name" value="Tab P12" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1840" />
+          <option name="screenY" value="2944" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="31" />
           <option name="brand" value="samsung" />
@@ -113,6 +124,17 @@
           <option name="screenX" value="1440" />
           <option name="screenY" value="3088" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="e1q" />
+          <option name="id" value="e1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S24" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
@@ -124,6 +146,17 @@
           <option name="screenX" value="2208" />
           <option name="screenY" value="1840" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
@@ -223,6 +256,17 @@
           <option name="screenX" value="1812" />
           <option name="screenY" value="2176" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q6q" />
+          <option name="id" value="q6q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-F956B" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1856" />
+          <option name="screenY" value="2160" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="30" />
           <option name="brand" value="google" />
@@ -279,17 +323,6 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2424" />
         </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="x1q" />
-          <option name="id" value="x1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S20" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3200" />
-        </PersistentDeviceSelectionData>
       </list>
     </option>
   </component>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f0cdb4e4..6d096c70 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -15,6 +15,7 @@
             </builds>
           </compositeBuild>
         </compositeConfiguration>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index d4b7accb..c224ad56 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.20" />
+    <option name="version" value="2.0.21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 00000000..16660f1d
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/android/build.gradle.kts b/app/android/build.gradle.kts
index 53a20403..9a712cbb 100644
--- a/app/android/build.gradle.kts
+++ b/app/android/build.gradle.kts
@@ -8,10 +8,6 @@ plugins {
     id("org.jetbrains.compose")
 }
 
-repositories {
-    maven("https://androidx.dev/storage/compose-compiler/repository/")
-}
-
 dependencies {
     implementation(projects.app.shared)
     implementation(projects.app.android.androidShared)
diff --git a/app/android/src/main/java/UpdateAwareAppScope.kt b/app/android/src/main/java/UpdateAwareAppScope.kt
index cf68c7e0..d0f1db33 100644
--- a/app/android/src/main/java/UpdateAwareAppScope.kt
+++ b/app/android/src/main/java/UpdateAwareAppScope.kt
@@ -11,7 +11,6 @@ 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
 import androidx.compose.material3.MaterialTheme
diff --git a/app/desktop/rules.pro b/app/desktop/rules.pro
index 26a19cb3..b303e491 100644
--- a/app/desktop/rules.pro
+++ b/app/desktop/rules.pro
@@ -70,7 +70,7 @@
 }
 
 # Coil
--keep class coil3.network.ktor2.internal.KtorNetworkFetcherServiceLoaderTarget
+-keep class coil3.network.ktor3.internal.KtorNetworkFetcherServiceLoaderTarget
 
 # https://github.com/Guardsquare/proguard/issues/349
 -dontoptimize
diff --git a/app/desktop/src/nonWindowsMain/kotlin/AuthorizationServer.kt b/app/desktop/src/nonWindowsMain/kotlin/AuthorizationServer.kt
index a2c32610..45805bed 100644
--- a/app/desktop/src/nonWindowsMain/kotlin/AuthorizationServer.kt
+++ b/app/desktop/src/nonWindowsMain/kotlin/AuthorizationServer.kt
@@ -17,7 +17,9 @@ import kotlinx.coroutines.cancel
 fun startAuthorizationServer(onAuth: () -> Unit) {
     val scope = CoroutineScope(Dispatchers.Default)
     scope.embeddedServer(Netty, port = authServerPort, module = { authModule(onAuth, scope) })
-        .start().stopServerOnCancellation()
+        .start().also {
+            it.engine.stopServerOnCancellation(it.application)
+        }
 }
 
 fun Application.authModule(onAuth: () -> Unit, scope: CoroutineScope) {
diff --git a/app/desktop/uwp_helper/Cargo.lock b/app/desktop/uwp_helper/Cargo.lock
index 245ff60f..47fc9d58 100644
--- a/app/desktop/uwp_helper/Cargo.lock
+++ b/app/desktop/uwp_helper/Cargo.lock
@@ -4,32 +4,32 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets 0.52.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -56,15 +56,6 @@ dependencies = [
  "toml",
 ]
 
-[[package]]
-name = "cc"
-version = "1.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
-dependencies = [
- "shlex",
-]
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -95,15 +86,15 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
 
 [[package]]
 name = "heck"
@@ -113,9 +104,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "indexmap"
-version = "2.4.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -129,9 +120,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
 [[package]]
 name = "linux-raw-sys"
@@ -153,39 +144,39 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "object"
-version = "0.36.3"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
@@ -207,9 +198,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustix"
-version = "0.38.35"
+version = "0.38.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
 dependencies = [
  "bitflags",
  "errno",
@@ -226,18 +217,18 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.213"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.213"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -246,9 +237,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 dependencies = [
  "itoa",
  "memchr",
@@ -258,24 +249,18 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
 [[package]]
 name = "syn"
-version = "2.0.76"
+version = "2.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
+checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -284,9 +269,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -297,9 +282,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
 dependencies = [
  "backtrace",
  "pin-project-lite",
@@ -340,9 +325,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
  "indexmap",
  "serde",
@@ -353,9 +338,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "uwp_helper"
@@ -563,9 +548,9 @@ source = "git+https://github.com/microsoft/windows-rs.git?rev=0.60.0#519ddf76962
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]
diff --git a/app/shared/src/commonMain/kotlin/ImageLoader.kt b/app/shared/src/commonMain/kotlin/ImageLoader.kt
index 8f5a82bd..5fdc6721 100644
--- a/app/shared/src/commonMain/kotlin/ImageLoader.kt
+++ b/app/shared/src/commonMain/kotlin/ImageLoader.kt
@@ -10,7 +10,7 @@ import coil3.compose.LocalPlatformContext
 import coil3.compose.rememberAsyncImagePainter
 import coil3.disk.DiskCache
 import coil3.memory.MemoryCache
-import coil3.network.ktor2.KtorNetworkFetcherFactory
+import coil3.network.ktor3.KtorNetworkFetcherFactory
 import coil3.request.ImageRequest
 import coil3.request.crossfade
 import dev.schlaubi.tonbrett.app.api.AppContext
@@ -63,7 +63,7 @@ fun newImageLoader(appContext: AppContext): ImageLoader = ImageLoader.Builder(ap
         // Set the max size to 25% of the app's available memory.
         .maxSizePercent(appContext.platformContext, percent = 0.25).build()
 }
-//    .diskCache { newDiskCache() }
+    .diskCache { newDiskCache() }
     .crossfade(false)
     .build()
 
diff --git a/bot/build.gradle.kts b/bot/build.gradle.kts
index dd13fc16..73bbaf29 100644
--- a/bot/build.gradle.kts
+++ b/bot/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
 kotlin {
     compilerOptions {
         languageVersion = KotlinVersion.KOTLIN_2_0
-        freeCompilerArgs.add("-Xcontext-receivers")
+        freeCompilerArgs.addAll("-Xcontext-receivers", "-Xdont-warn-on-error-suppression")
     }
 }
 
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/Plugin.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/Plugin.kt
index b8b70b7c..04573b54 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/Plugin.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/Plugin.kt
@@ -1,6 +1,8 @@
 package dev.schlaubi.tonbrett.bot
 
 import com.kotlindiscord.kord.extensions.builders.ExtensibleBotBuilder
+import com.kotlindiscord.kord.extensions.extensions.primaryEntryPointCommand
+import dev.kord.common.entity.EntryPointCommandHandlerType
 import dev.kord.gateway.Intent
 import dev.schlaubi.mikbot.plugin.api.Plugin
 import dev.schlaubi.mikbot.plugin.api.PluginContext
@@ -34,5 +36,12 @@ private class Module(context: PluginContext) : SubCommandModule(context) {
         updateCommand()
         joinCommand()
         playCommand()
+
+        primaryEntryPointCommand {
+            name = "Tonbrett"
+            description = "commands.entry_point.description"
+
+            handler = EntryPointCommandHandlerType.DiscordLaunchActivity
+        }
     }
 }
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Authentication.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Authentication.kt
index f4da9507..6088efec 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Authentication.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Authentication.kt
@@ -30,6 +30,7 @@ import io.ktor.server.routing.*
 import io.ktor.server.sessions.*
 import kotlinx.datetime.Clock
 import kotlinx.datetime.toJavaInstant
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
@@ -40,6 +41,7 @@ import io.ktor.server.routing.Route as KtorRoute
 private const val discordAuth = "discord"
 private const val jwtAuth = "jwt"
 
+@Serializable
 data class Session(val type: Route.Auth.Type)
 
 private val jwtVerifier = JWT
@@ -67,7 +69,6 @@ private val oauthSettings = OAuthServerSettings.OAuth2ServerSettings(
     defaultScopes = listOf("identify")
 )
 
-
 fun Application.installAuth() {
     install(Sessions) {
         cookie<Session>("AUTH_SESSION")
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/FileServer.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/FileServer.kt
index 8ea67577..d3f00b44 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/FileServer.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/FileServer.kt
@@ -20,7 +20,7 @@ fun Route.files() {
         val path = Config.SOUNDS_FOLDER / sound.fileName
 
         val contentType = contentTypeRaw?.let { ContentType.parse(contentTypeRaw) }
-            ?: ContentType.defaultForFile(path)
+            ?: ContentType.defaultForPath(path)
 
         val content = LocalFileContent(
             path.toFile(),
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ktor.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ktor.kt
index 385aba2d..93a38331 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ktor.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ktor.kt
@@ -31,7 +31,7 @@ class Ktor : KtorExtensionPoint, KordExKoinComponent {
             val json = Json {
                 serializersModule = IdKotlinXSerializationModule
             }
-            pingPeriod = 30.seconds.toJavaDuration()
+            pingPeriod = 30.seconds
             contentConverter = KotlinxWebsocketSerializationConverter(json)
         }
         installAuth()
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ui.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ui.kt
index 5fc89cc8..175a1e1c 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ui.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ui.kt
@@ -2,8 +2,10 @@ package dev.schlaubi.tonbrett.bot.server
 
 import dev.schlaubi.tonbrett.common.Route.AuthDeepLink
 import dev.schlaubi.tonbrett.common.Route.Ui
+import io.ktor.events.Events
 import io.ktor.http.HttpHeaders
 import io.ktor.server.application.*
+import io.ktor.server.application.Application
 import io.ktor.server.engine.*
 import io.ktor.server.http.content.*
 import io.ktor.server.resources.*
@@ -11,10 +13,12 @@ import io.ktor.server.response.header
 import io.ktor.server.routing.*
 import kotlin.reflect.jvm.javaField
 
+private val ClassLoaderFixer = createRouteScopedPlugin("ClassLoaderFixer") {
+    onCall { call -> call.fixClassLoader() }
+}
+
 private inline fun <reified T : Any> Route.staticUi(index: String? = "index.html") = resource<T> {
-    intercept(ApplicationCallPipeline.Plugins) {
-        call.fixClassLoader()
-    }
+    install(ClassLoaderFixer)
     staticResources("", "web", index = index)
 }
 
@@ -25,9 +29,17 @@ fun Route.ui() {
     staticUi<Ui.DiscordActivity>(index = "discord-activity.html")
 }
 
+
 private fun ApplicationCall.fixClassLoader() {
-    val fixedApplication = Application(HackedEnvironment(application.environment))
-    val call = (this as RoutingApplicationCall).engineCall
+    @Suppress("INVISIBLE_REFERENCE")
+    val fixedApplication = Application(
+        HackedEnvironment(application.environment),
+        false,
+        "/",
+        Events(),
+        coroutineContext,
+        { error("Unsupported") })
+    val call = (this as RoutingPipelineCall).engineCall
     BaseApplicationCall::application.javaField!!.apply {
         isAccessible = true
         set(call, fixedApplication)
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/WebSocket.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/WebSocket.kt
index 352d9137..f9e60912 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/WebSocket.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/WebSocket.kt
@@ -13,15 +13,16 @@ import io.ktor.server.application.call
 import io.ktor.server.resources.resource
 import io.ktor.server.response.respond
 import io.ktor.server.routing.Route
+import io.ktor.server.routing.intercept
 import io.ktor.server.websocket.DefaultWebSocketServerSession
 import io.ktor.server.websocket.sendSerialized
 import io.ktor.server.websocket.webSocket
 import io.ktor.util.AttributeKey
-import io.ktor.utils.io.errors.IOException
 import io.ktor.websocket.CloseReason
 import io.ktor.websocket.close
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
+import kotlinx.io.IOException
 import mu.KotlinLogging
 import kotlin.collections.component1
 import kotlin.collections.component2
diff --git a/bot/src/main/resources/translations/soundboard/strings_de_DE.properties b/bot/src/main/resources/translations/soundboard/strings_de_DE.properties
index a10ac593..d66bba4e 100644
--- a/bot/src/main/resources/translations/soundboard/strings_de_DE.properties
+++ b/bot/src/main/resources/translations/soundboard/strings_de_DE.properties
@@ -32,3 +32,4 @@ commands.update_sound.arguments.public.description=Ob diese Audio öffentlich se
 commands.add_sound.arguments.public.description=Ob diese Audio öffentlich sein soll
 commands.add_sound.arguments.volume.description=Die Lautstärke in der die Audio abgespielt werden soll
 commands.update_sound.arguments.volume.description=Die Lautstärke in der die Audio abgespielt werden soll
+commands.entry_point.description=Bietet dir tolle Audios zum abspielen
diff --git a/bot/src/main/resources/translations/soundboard/strings_en_GB.properties b/bot/src/main/resources/translations/soundboard/strings_en_GB.properties
index b581fca1..295115ca 100644
--- a/bot/src/main/resources/translations/soundboard/strings_en_GB.properties
+++ b/bot/src/main/resources/translations/soundboard/strings_en_GB.properties
@@ -32,3 +32,4 @@ commands.update_sound.arguments.public.description=Whether this command should b
 commands.add_sound.arguments.public.description=Whether this command should be public
 commands.add_sound.arguments.volume.description=The volume of the audio
 commands.update_sound.arguments.volume.description=The volume of the audio
+commands.entry_point.description=Offers sounds to play
diff --git a/buildSrc/src/main/kotlin/Android.kt b/buildSrc/src/main/kotlin/Android.kt
index 321d7a8a..6b585422 100644
--- a/buildSrc/src/main/kotlin/Android.kt
+++ b/buildSrc/src/main/kotlin/Android.kt
@@ -1,4 +1,4 @@
 package dev.schlaubi.tonbrett.gradle
 
-const val sdkInt = 34
+const val sdkInt = 35
 const val androidSdk = "android-$sdkInt"
diff --git a/client/src/commonMain/kotlin/Tonbrett.kt b/client/src/commonMain/kotlin/Tonbrett.kt
index 1ff2dd60..523ab7eb 100644
--- a/client/src/commonMain/kotlin/Tonbrett.kt
+++ b/client/src/commonMain/kotlin/Tonbrett.kt
@@ -42,6 +42,11 @@ private var HttpRequestBuilder.useUnicode: Boolean
  */
 class ReauthorizationRequiredException : Exception()
 
+private val webSocketRetryStrategy = HttpRequestRetryConfig().apply {
+    maxRetries = 5
+    exponentialDelay()
+}
+
 /**
  * API client for the Tonbrett api.
  *
@@ -64,10 +69,6 @@ class Tonbrett(
         install(ContentNegotiation) {
             json(json)
         }
-        install(WebSocketRetry) {
-            maxRetries = 5
-            exponentialDelay()
-        }
         install(WebSockets) {
             contentConverter = KotlinxWebsocketSerializationConverter(json)
         }
@@ -83,7 +84,7 @@ class Tonbrett(
                         expectSuccess = false
                         authorize = false
                         contentType(ContentType.Application.Json)
-                        setBody(AuthRefreshRequest(expiredJwt = oldTokens!!.refreshToken))
+                        setBody(AuthRefreshRequest(expiredJwt = oldTokens!!.refreshToken!!))
                     }
                     if (!response.status.isSuccess()) {
                         throw ReauthorizationRequiredException()
@@ -105,7 +106,7 @@ class Tonbrett(
                             url {
                                 protocol = if (baseUrl.protocol.isSecure()) URLProtocol.WSS else URLProtocol.WS
                                 port = baseUrl.port
-                                pathSegments = baseUrl.pathSegments + url.pathSegments
+                                pathSegments = baseUrl.rawSegments + url.pathSegments
                             }
                         }
                     }
@@ -178,7 +179,7 @@ class Tonbrett(
 
     @OptIn(DelicateCoroutinesApi::class)
     suspend fun connect(useUnicode: Boolean = false) {
-        client.retryingWebSocket({ this.useUnicode = useUnicode }) {
+        client.retryingWebSocket({ this.useUnicode = useUnicode }, webSocketRetryStrategy) {
             while (!incoming.isClosedForReceive) {
                 try {
                     val event = receiveDeserialized<Event>()
diff --git a/client/src/commonMain/kotlin/WebSocketRetry.kt b/client/src/commonMain/kotlin/WebSocketRetry.kt
index 03e07785..1acea47c 100644
--- a/client/src/commonMain/kotlin/WebSocketRetry.kt
+++ b/client/src/commonMain/kotlin/WebSocketRetry.kt
@@ -1,4 +1,4 @@
-@file:Suppress("INVISIBLE_MEMBER", "NON_PUBLIC_CALL_FROM_PUBLIC_INLINE", "INVISIBLE_REFERENCE")
+@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 
 package dev.schlaubi.tonbrett.client
 
@@ -11,17 +11,14 @@ import io.ktor.utils.io.core.*
 import io.ktor.websocket.*
 import kotlinx.coroutines.channels.ClosedReceiveChannelException
 import io.github.oshai.kotlinlogging.KotlinLogging
+import io.ktor.client.plugins.HttpRetryDelayContext
+import io.ktor.util.AttributeKey
+import kotlinx.io.EOFException
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 
 private val LOG = KotlinLogging.logger {  }
 
-/**
- * WebSocket version of the [HttpRequestRetry] plugin.
- *
- * @see retryingWebSocket
- */
-val WebSocketRetry = createClientPlugin("WebSocketRetry", { HttpRequestRetry.Configuration() }) {}
 
 /**
  * Exception used for logging WebSocket connection errors.
@@ -36,21 +33,21 @@ class DisconnectedException(protocolCause: CloseReason?) :
  */
 suspend fun HttpClient.retryingWebSocket(
     httpRequestBuilder: HttpRequestBuilder.() -> Unit,
+    config: HttpRequestRetryConfig,
     handler: suspend DefaultClientWebSocketSession.() -> Unit
 ) {
-    val plugin = plugin(WebSocketRetry)
-    val context = WebSocketRetryContext(this, plugin.config, httpRequestBuilder, handler)
+    val context = WebSocketRetryContext(this, config, httpRequestBuilder, handler)
     context.connect()
 }
 
 private class WebSocketRetryContext(
     val client: HttpClient,
-    val config: HttpRequestRetry.Configuration,
+    val config: HttpRequestRetryConfig,
     val httpRequestBuilder: HttpRequestBuilder.() -> Unit,
     val handler: suspend DefaultClientWebSocketSession.() -> Unit
 ) {
     lateinit var session: DefaultClientWebSocketSession
-    private var delayContext: HttpRequestRetry.DelayContext? = null
+    private var delayContext: HttpRetryDelayContext? = null
     private var tries = 1
 
     fun reset() {
@@ -63,7 +60,7 @@ private class WebSocketRetryContext(
 
     suspend fun reconnect(e: Throwable, isRetry: Boolean = true) {
         if (!isRetry) {
-            delayContext = HttpRequestRetry.DelayContext(
+            delayContext = HttpRetryDelayContext(
                 HttpRequestBuilder(),
                 session.call.response,
                 e
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5aa38ae2..f3dcdbba 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,21 +1,21 @@
 [versions]
-kotlin = "2.0.20"
-ktor = "2.3.12"
+kotlin = "2.0.21"
+ktor = "3.0.0"
 kmongo = "5.1.0"
 kord = "0.14.0"
-mikbot = "3.37.3"
-ksp = "2.0.20-1.0.24"
-kordex = "1.9.0-SNAPSHOT"
-android = "8.8.0-alpha03"
-compose = "1.7.0-beta02"
+mikbot = "3.37.19"
+ksp = "2.0.21-1.0.26"
+kordex = "1.9.12-mikbot-SNAPSHOT"
+android = "8.7.1"
+compose = "1.7.0"
 compose-wear = "1.4.0"
 lyricist = "1.7.0"
 google-play = "2.1.0"
 coroutines = "1.9.0"
 play-services-wearable = "18.2.0"
-horologist = "0.7.2-alpha"
-protobuf = "4.27.3"
-coil = "3.0.0-alpha10"
+horologist = "0.7.3-alpha"
+protobuf = "4.28.3"
+coil = "3.0.0-rc01"
 
 [libraries]
 kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.7.3" }
@@ -49,20 +49,20 @@ ktor-sse = { group = "io.ktor", name = "ktor-sse", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
 
 mikbot-ktor = { group = "dev.schlaubi", name = "mikbot-ktor", version.ref = "mikbot" }
-mikbot-music = { group = "dev.schlaubi", name = "mikbot-music-player", version = "3.11.5-SNAPSHOT" }
+mikbot-music = { group = "dev.schlaubi", name = "mikbot-music-player", version = "3.12.0-SNAPSHOT" }
 
 kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.0" }
 
 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.5.8" }
+logback = { group = "ch.qos.logback", name = "logback-classic", version = "1.5.11" }
 
 kvault = { group = "com.liftric", name = "kvault", version = "1.12.0" }
 
-androidx-activity = { group = "androidx.activity", name = "activity-compose", version = "1.9.2" }
+androidx-activity = { group = "androidx.activity", name = "activity-compose", version = "1.9.3" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.0" }
-androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.13.1" }
+androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.15.0-rc01" }
 androidx-browser = { group = "androidx.browser", name = "browser", version = "1.8.0" }
 mdc-android = { group = "com.google.android.material", name = "material", version = "1.12.0" }
 google-play = { group = "com.google.android.play", name = "app-update", version.ref = "google-play" }
@@ -85,7 +85,7 @@ horologist-datalayer = { group = "com.google.android.horologist", name = "horolo
 coil-compose = { group = "io.coil-kt.coil3", name = "coil-compose", version.ref = "coil" }
 coil-gif = { group = "io.coil-kt.coil3", name = "coil-gif", version.ref = "coil" }
 coil-svg = { group = "io.coil-kt.coil3", name = "coil-svg", version.ref = "coil" }
-coil-network = { group = "io.coil-kt.coil3", name = "coil-network-ktor2", version.ref = "coil" }
+coil-network = { group = "io.coil-kt.coil3", name = "coil-network-ktor3", version.ref = "coil" }
 
 kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }