From d97d3c49271f2b6cf72135aca35a69598996e749 Mon Sep 17 00:00:00 2001
From: Michael Rittmeister <michael@rittmeister.in>
Date: Sun, 2 Jun 2024 15:34:56 +0200
Subject: [PATCH] Some minor improvements - No longer use KMP setup for desktop
 - Upgrade dependencies - Upgrade CI versions - Re-enable UWP helper on
 windows - Possibly fix msstore update

---
 .github/workflows/ci.yml                      |   2 +-
 .github/workflows/docker-publish.yml          |   4 +-
 .github/workflows/maven.yml                   |   4 +-
 .github/workflows/winget.yml                  |   3 +-
 .idea/gradle.xml                              |   1 +
 .idea/kotlinc.xml                             |   2 +-
 .idea/misc.xml                                |   2 +-
 app/android/build.gradle.kts                  |   3 +-
 app/desktop/build.gradle.kts                  |  54 ++++++-------
 app/desktop/src/commonMain/kotlin/Platform.kt |  25 ------
 .../kotlin/AuthorizationScreen.kt             |   4 +-
 .../src/{commonMain => main}/kotlin/Main.kt   |   9 ++-
 app/desktop/src/main/kotlin/Platform.kt       |  32 ++++++++
 .../kotlin/TokenStorageAppContext.kt          |   3 +
 .../resources/logback.xml                     |   0
 .../{commonMain => main}/resources/logo.png   | Bin
 .../src/nonWindowsMain/kotlin/Platform.kt     |  36 +++++----
 .../src/windowsMain/kotlin/Platform.kt        |  72 +++++++++---------
 app/desktop/uwp_helper/Cargo.lock             |  68 +++++++++++------
 app/desktop/uwp_helper/Cargo.toml             |   4 +-
 app/shared/build.gradle.kts                   |  12 +--
 .../schlaubi/tonbrett/bot/config/Config.kt    |   4 +-
 build.gradle.kts                              |  11 +--
 .../kotlin/multiplatform-module.gradle.kts    |   4 +-
 client/build.gradle.kts                       |   5 ++
 gradle.properties                             |   2 +
 gradle/libs.versions.toml                     |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 28 files changed, 205 insertions(+), 165 deletions(-)
 delete mode 100644 app/desktop/src/commonMain/kotlin/Platform.kt
 rename app/desktop/src/{commonMain => main}/kotlin/AuthorizationScreen.kt (91%)
 rename app/desktop/src/{commonMain => main}/kotlin/Main.kt (93%)
 create mode 100644 app/desktop/src/main/kotlin/Platform.kt
 rename app/desktop/src/{commonMain => main}/kotlin/TokenStorageAppContext.kt (67%)
 rename app/desktop/src/{commonMain => main}/resources/logback.xml (100%)
 rename app/desktop/src/{commonMain => main}/resources/logo.png (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 51351ff4..9bd41b51 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -324,7 +324,7 @@ jobs:
         with:
           name: android-app
       - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: |
             app/desktop/build/compose/binaries/main-release/deb/*.deb
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 0af890b0..04125c06 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -23,15 +23,13 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Install the cosign tool except on PR
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
         if: github.event_name != 'pull_request'
         uses: sigstore/cosign-installer@v3
-        with:
-          cosign-release: 'v1.13.1'
 
 
       # Workaround: https://github.com/docker/build-push-action/issues/461
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 3d272f72..13ac789f 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -13,8 +13,8 @@ jobs:
     name: Publish To Maven
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 22
diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml
index 38f52e2c..1fa517cb 100644
--- a/.github/workflows/winget.yml
+++ b/.github/workflows/winget.yml
@@ -7,6 +7,7 @@ on:
       - published
       - created
       - released
+      - prereleased
       
 jobs:
   winget:
@@ -29,5 +30,5 @@ jobs:
           wingetcreate.exe update Schlaubi.Tonbrett -u $url --version $version
 
           if ($version -notmatch "-") {
-            .\wingetcreate.exe submit .\manifests\s\Schlaubi\Tonbrett\${version}\ --token $env:WINGET_GITHUB_TOKEN
+            wingetcreate.exe submit .\manifests\s\Schlaubi\Tonbrett\${version}\ --token $env:WINGET_GITHUB_TOKEN
           }
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8f72cf8c..f0cdb4e4 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -16,6 +16,7 @@
           </compositeBuild>
         </compositeConfiguration>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index f5e115d3..6d0ee1c2 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.0-RC1" />
+    <option name="version" value="2.0.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f4bdd2bb..5735c297 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -28,7 +28,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_22" default="true" project-jdk-name="22" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/android/build.gradle.kts b/app/android/build.gradle.kts
index cbea2708..355d2a9d 100644
--- a/app/android/build.gradle.kts
+++ b/app/android/build.gradle.kts
@@ -1,5 +1,4 @@
 import dev.schlaubi.tonbrett.gradle.sdkInt
-import org.jetbrains.kotlin.config.LanguageVersion
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
@@ -68,7 +67,7 @@ android {
     }
 
     compileOptions {
-        targetCompatibility = JavaVersion.VERSION_20
+        targetCompatibility = JavaVersion.VERSION_22
     }
 
     kotlin {
diff --git a/app/desktop/build.gradle.kts b/app/desktop/build.gradle.kts
index 76d17229..e5b59471 100644
--- a/app/desktop/build.gradle.kts
+++ b/app/desktop/build.gradle.kts
@@ -1,48 +1,40 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.kotlin.konan.target.HostManager
 import org.jetbrains.kotlin.org.jline.utils.OSUtils
 
 plugins {
     alias(libs.plugins.kotlin.compose)
-    kotlin("multiplatform")
+    kotlin("jvm")
     kotlin("plugin.serialization")
     id("org.jetbrains.compose")
 }
 
-kotlin {
-    jvm()
+val windowsBuild = HostManager.hostIsMingw && rootProject.property("dev.schlaubi.tonbrett.no_windows") != "true"
 
-    sourceSets {
-        val windowsMain by creating {
-            dependsOn(commonMain.get())
-            dependencies {
-                implementation(projects.app.desktop.uwpHelper)
-            }
-        }
-        val nonWindowsMain by creating {
-            dependsOn(commonMain.get())
-            dependencies {
-                implementation(libs.ktor.server.netty)
-                implementation(libs.ktor.server.cors)
-            }
-        }
+dependencies {
+    implementation(projects.app.shared)
+    implementation(project.dependencies.compose.desktop.currentOs)
+    implementation(project.dependencies.compose.materialIconsExtended)
+    implementation(project.dependencies.compose.material3)
+    implementation(libs.logback)
 
-        jvmMain {
-            if (OSUtils.IS_WINDOWS && false) {
-                dependsOn(windowsMain)
-            } else {
-                dependsOn(nonWindowsMain)
-            }
-            dependencies {
-                implementation(projects.app.shared)
-                implementation(project.dependencies.compose.desktop.currentOs)
-                implementation(project.dependencies.compose.materialIconsExtended)
-                implementation(project.dependencies.compose.material3)
-                implementation(libs.logback)
-            }
-        }
+    if(windowsBuild) {
+        implementation(projects.app.desktop.uwpHelper)
+    } else {
+        implementation(libs.ktor.server.netty)
+        implementation(libs.ktor.server.cors)
     }
 }
 
+sourceSets {
+    main {
+        if(windowsBuild) {
+            kotlin.srcDir("src/windowsMain/kotlin")
+        } else {
+            kotlin.srcDir("src/nonWindowsMain/kotlin")
+        }
+    }
+}
 
 compose.desktop {
     application {
diff --git a/app/desktop/src/commonMain/kotlin/Platform.kt b/app/desktop/src/commonMain/kotlin/Platform.kt
deleted file mode 100644
index 533c2ef5..00000000
--- a/app/desktop/src/commonMain/kotlin/Platform.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-@file:JvmName("Platform")
-package dev.schlaubi.tonbrett.app.desktop
-
-import dev.schlaubi.tonbrett.common.Route
-import java.net.URI
-
-expect val loginType: Route.Auth.Type
-
-/**
- * Runs any preparation steps for authentication
- */
-expect fun prepareAuthentication(onAuth: () -> Unit)
-
-expect fun start(args: Array<String>)
-
-/**
- * Tries to launch the URI using the UWP `Launcher`.
- *
- * @param uri the [URI] to launch
- */
-expect fun launchUri(uri: URI)
-
-expect fun getToken(): String
-
-expect fun setToken(token: String)
\ No newline at end of file
diff --git a/app/desktop/src/commonMain/kotlin/AuthorizationScreen.kt b/app/desktop/src/main/kotlin/AuthorizationScreen.kt
similarity index 91%
rename from app/desktop/src/commonMain/kotlin/AuthorizationScreen.kt
rename to app/desktop/src/main/kotlin/AuthorizationScreen.kt
index 71cfa21c..229101ae 100644
--- a/app/desktop/src/commonMain/kotlin/AuthorizationScreen.kt
+++ b/app/desktop/src/main/kotlin/AuthorizationScreen.kt
@@ -7,7 +7,6 @@ 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
 import androidx.compose.material3.Icon
@@ -19,6 +18,9 @@ import androidx.compose.ui.unit.dp
 import cafe.adriel.lyricist.LocalStrings
 import dev.schlaubi.tonbrett.app.ColorScheme
 import dev.schlaubi.tonbrett.app.api.getUrl
+import dev.schlaubi.tonbrett.app.desktop.Platform.launchUri
+import dev.schlaubi.tonbrett.app.desktop.Platform.loginType
+import dev.schlaubi.tonbrett.app.desktop.Platform.prepareAuthentication
 import dev.schlaubi.tonbrett.client.href
 import dev.schlaubi.tonbrett.common.Route
 import io.ktor.http.*
diff --git a/app/desktop/src/commonMain/kotlin/Main.kt b/app/desktop/src/main/kotlin/Main.kt
similarity index 93%
rename from app/desktop/src/commonMain/kotlin/Main.kt
rename to app/desktop/src/main/kotlin/Main.kt
index 7b02686a..ad082725 100644
--- a/app/desktop/src/commonMain/kotlin/Main.kt
+++ b/app/desktop/src/main/kotlin/Main.kt
@@ -20,10 +20,15 @@ import androidx.compose.ui.res.loadImageBitmap
 import androidx.compose.ui.res.useResource
 import androidx.compose.ui.window.*
 import cafe.adriel.lyricist.LocalStrings
-import dev.schlaubi.tonbrett.app.*
+import dev.schlaubi.tonbrett.app.ColorScheme
+import dev.schlaubi.tonbrett.app.ProvideLocalWindow
+import dev.schlaubi.tonbrett.app.TonbrettApp
 import dev.schlaubi.tonbrett.app.api.ProvideContext
-import io.ktor.serialization.*
+import dev.schlaubi.tonbrett.app.desktop.Platform.launchUri
+import dev.schlaubi.tonbrett.app.desktop.Platform.start
+import dev.schlaubi.tonbrett.app.title
 import io.github.oshai.kotlinlogging.KotlinLogging
+import io.ktor.serialization.*
 import java.net.URI
 import java.awt.Window as AWTWindow
 
diff --git a/app/desktop/src/main/kotlin/Platform.kt b/app/desktop/src/main/kotlin/Platform.kt
new file mode 100644
index 00000000..7b7e1c74
--- /dev/null
+++ b/app/desktop/src/main/kotlin/Platform.kt
@@ -0,0 +1,32 @@
+@file:JvmName("Platform")
+package dev.schlaubi.tonbrett.app.desktop
+
+import dev.schlaubi.tonbrett.common.Route
+import java.net.URI
+
+/**
+ * Implementations are in `src/nonWindowsMain` and `src/windowsMain`
+ */
+object Platform : IPlatform by currentPlatform
+
+interface IPlatform {
+    val loginType: Route.Auth.Type
+
+    /**
+     * Runs any preparation steps for authentication
+     */
+    fun prepareAuthentication(onAuth: () -> Unit)
+
+    fun start(args: Array<String>)
+
+    /**
+     * Tries to launch the URI using the UWP `Launcher`.
+     *
+     * @param uri the [URI] to launch
+     */
+    fun launchUri(uri: URI)
+
+    fun getToken(): String
+
+    fun setToken(token: String)
+}
diff --git a/app/desktop/src/commonMain/kotlin/TokenStorageAppContext.kt b/app/desktop/src/main/kotlin/TokenStorageAppContext.kt
similarity index 67%
rename from app/desktop/src/commonMain/kotlin/TokenStorageAppContext.kt
rename to app/desktop/src/main/kotlin/TokenStorageAppContext.kt
index 7d0c71cf..2b9f64ba 100644
--- a/app/desktop/src/commonMain/kotlin/TokenStorageAppContext.kt
+++ b/app/desktop/src/main/kotlin/TokenStorageAppContext.kt
@@ -1,6 +1,9 @@
 package dev.schlaubi.tonbrett.app.desktop
 
 import dev.schlaubi.tonbrett.app.api.AppContext
+import dev.schlaubi.tonbrett.app.desktop.Platform.getToken
+import dev.schlaubi.tonbrett.app.desktop.Platform.setToken
+
 
 abstract class TokenStorageAppContext : AppContext() {
     override var token: String
diff --git a/app/desktop/src/commonMain/resources/logback.xml b/app/desktop/src/main/resources/logback.xml
similarity index 100%
rename from app/desktop/src/commonMain/resources/logback.xml
rename to app/desktop/src/main/resources/logback.xml
diff --git a/app/desktop/src/commonMain/resources/logo.png b/app/desktop/src/main/resources/logo.png
similarity index 100%
rename from app/desktop/src/commonMain/resources/logo.png
rename to app/desktop/src/main/resources/logo.png
diff --git a/app/desktop/src/nonWindowsMain/kotlin/Platform.kt b/app/desktop/src/nonWindowsMain/kotlin/Platform.kt
index c1ef4ac9..a91c772b 100644
--- a/app/desktop/src/nonWindowsMain/kotlin/Platform.kt
+++ b/app/desktop/src/nonWindowsMain/kotlin/Platform.kt
@@ -7,22 +7,30 @@ import java.nio.file.Path
 import kotlin.io.path.Path
 import kotlin.io.path.div
 
-actual val loginType = Route.Auth.Type.APP
+val currentPlatform: IPlatform = UnixPlatform()
 
-actual fun start(args: Array<String>) {
-    val needsAuth = runCatching { getToken() }.isFailure
-    startApplication(needsAuth)
-}
+private class UnixPlatform : IPlatform {
+
+    override val loginType = Route.Auth.Type.APP
+
+    override fun start(args: Array<String>) {
+        val needsAuth = runCatching { getToken() }.isFailure
+        startApplication(needsAuth)
+    }
 
-actual fun prepareAuthentication(onAuth: () -> Unit) = startAuthorizationServer(onAuth)
+    override fun prepareAuthentication(onAuth: () -> Unit) = startAuthorizationServer(onAuth)
 
-actual fun launchUri(uri: URI) {
-    val desktop = Desktop.getDesktop()
-    if (desktop.isSupported(Desktop.Action.BROWSE)) {
-        desktop.browse(uri)
-    } else {
-        Runtime.getRuntime().exec(arrayOf("xdg-open", uri.toString()))
+    override fun launchUri(uri: URI) {
+        val desktop = Desktop.getDesktop()
+        if (desktop.isSupported(Desktop.Action.BROWSE)) {
+            desktop.browse(uri)
+        } else {
+            Runtime.getRuntime().exec(arrayOf("xdg-open", uri.toString()))
+        }
     }
+
+    override fun getToken() = getConfig().sessionToken ?: error("Not signed in")
+    override fun setToken(token: String) = saveConfig(Config((token)))
 }
 
 fun getAppDataRoaming(): Path {
@@ -31,10 +39,8 @@ fun getAppDataRoaming(): Path {
         os.contains("windows", ignoreCase = true) -> Path(System.getenv("APPDATA"))
         os.contains("mac", ignoreCase = true) ->
             Path(System.getenv("HOME")) / "Library" / "Application Support"
+
         else -> Path(System.getProperty("user.home"))
     }
     return basePath / "Tonbrett"
 }
-
-actual fun getToken() = getConfig().sessionToken ?: error("Not signed in")
-actual fun setToken(token: String) = saveConfig(Config((token)))
diff --git a/app/desktop/src/windowsMain/kotlin/Platform.kt b/app/desktop/src/windowsMain/kotlin/Platform.kt
index 9b661bf1..d82001a8 100644
--- a/app/desktop/src/windowsMain/kotlin/Platform.kt
+++ b/app/desktop/src/windowsMain/kotlin/Platform.kt
@@ -4,12 +4,12 @@ import dev.schlaubi.tonbrett.app.desktop.uwp_helper.StringResult
 import dev.schlaubi.tonbrett.app.desktop.uwp_helper.UwpHelper.*
 import dev.schlaubi.tonbrett.app.uwpTempFolder
 import dev.schlaubi.tonbrett.common.Route
+import io.github.oshai.kotlinlogging.KotlinLogging
 import io.ktor.http.*
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import io.github.oshai.kotlinlogging.KotlinLogging
 import java.lang.foreign.Arena
 import java.lang.foreign.MemorySegment
 import java.lang.foreign.SegmentAllocator
@@ -18,50 +18,53 @@ import kotlin.system.exitProcess
 
 private val LOG = KotlinLogging.logger { }
 
-actual val loginType = Route.Auth.Type.PROTOCOL
+val currentPlatform: IPlatform = WindowsPlatform()
+
+private class WindowsPlatform : IPlatform {
+    override val loginType = Route.Auth.Type.PROTOCOL
 
-actual fun prepareAuthentication(onAuth: () -> Unit): Unit = exitProcess(0)
+    override fun prepareAuthentication(onAuth: () -> Unit): Unit = exitProcess(0)
 
-@OptIn(DelicateCoroutinesApi::class)
-actual fun start(args: Array<String>) {
-    val tempFolder = getTempFolder()
-    System.setProperty(uwpTempFolder, tempFolder)
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun start(args: Array<String>) {
+        val tempFolder = getTempFolder()
+        System.setProperty(uwpTempFolder, tempFolder)
 
-    val argsString = args.joinToString(" ")
-    if (argsString.startsWith("tonbrett://login")) {
-        try {
-            LOG.info { "Launched App with $argsString saving token now" }
-            val token = Url(argsString).parameters["token"]!!
-            setToken(token)
-        } catch (e: Exception) {
-            e.printStackTrace()
-            Thread.sleep(50000)
+        val argsString = args.joinToString(" ")
+        if (argsString.startsWith("tonbrett://login")) {
+            try {
+                LOG.info { "Launched App with $argsString saving token now" }
+                val token = Url(argsString).parameters["token"]!!
+                setToken(token)
+            } catch (e: Exception) {
+                e.printStackTrace()
+                Thread.sleep(50000)
+            }
+            startApplication()
+        } else {
+            val needsAuth = runCatching { getToken() }.isFailure
+            startApplication(needsAuth)
         }
         GlobalScope.launch(Dispatchers.IO) { request_msstore_auto_update() }
-        startApplication()
-    } else {
-        val needsAuth = runCatching { getToken() }.isFailure
-        startApplication(needsAuth)
     }
-}
 
-actual fun launchUri(uri: URI): Unit = Arena.ofConfined().use { arena ->
-    val url = arena.allocateFrom(uri.toString())
-    launch_uri(url)
-}
+    override fun launchUri(uri: URI): Unit = Arena.ofConfined().use { arena ->
+        val url = arena.allocateFrom(uri.toString())
+        launch_uri(url)
+    }
 
-actual fun setToken(token: String) = Arena.ofConfined().use { arena ->
-    val tokenStr = arena.allocateFrom(token)
-    store_token(tokenStr)
-}
+    override fun setToken(token: String) = Arena.ofConfined().use { arena ->
+        val tokenStr = arena.allocateFrom(token)
+        store_token(tokenStr)
+    }
 
-actual fun getToken(): String = invokeStringResultFunction(::get_token)
+    override fun getToken(): String = invokeStringResultFunction(::get_token)
 
-private fun getTempFolder(): String = invokeStringResultFunction(::get_temp_folder)
+    private fun getTempFolder(): String = invokeStringResultFunction(::get_temp_folder)
 
-private fun invokeStringResultFunction(
-    function: (SegmentAllocator) -> MemorySegment
-) = Arena.ofConfined().use { arena ->
+    private fun invokeStringResultFunction(
+        function: (SegmentAllocator) -> MemorySegment
+    ) = Arena.ofConfined().use { arena ->
         val result = function(arena)
         val isError = StringResult.is_error(result)
         val length = StringResult.length(result).coerceAtLeast(0)
@@ -75,3 +78,4 @@ private fun invokeStringResultFunction(
         val string = String(charArray)
         if (isError) throw Exception(string) else string
     }
+}
diff --git a/app/desktop/uwp_helper/Cargo.lock b/app/desktop/uwp_helper/Cargo.lock
index b6cc83dd..06af31b9 100644
--- a/app/desktop/uwp_helper/Cargo.lock
+++ b/app/desktop/uwp_helper/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
 dependencies = [
  "gimli",
 ]
@@ -25,9 +25,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "backtrace"
-version = "0.3.71"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
 dependencies = [
  "addr2line",
  "cc",
@@ -92,9 +92,9 @@ checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "hashbrown"
@@ -175,9 +175,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
 dependencies = [
  "memchr",
 ]
@@ -190,9 +190,9 @@ checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.83"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
 dependencies = [
  "unicode-ident",
 ]
@@ -233,18 +233,18 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "serde"
-version = "1.0.202"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.202"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -298,9 +298,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
  "backtrace",
  "num_cpus",
@@ -310,9 +310,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -346,9 +346,9 @@ dependencies = [
 
 [[package]]
 name = "windows"
-version = "0.54.0"
+version = "0.56.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
+checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132"
 dependencies = [
  "windows-core",
  "windows-targets",
@@ -356,14 +356,38 @@ dependencies = [
 
 [[package]]
 name = "windows-core"
-version = "0.54.0"
+version = "0.56.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
+checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
 dependencies = [
+ "windows-implement",
+ "windows-interface",
  "windows-result",
  "windows-targets",
 ]
 
+[[package]]
+name = "windows-implement"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.1.1"
diff --git a/app/desktop/uwp_helper/Cargo.toml b/app/desktop/uwp_helper/Cargo.toml
index d5bbcdc6..f3a5c198 100644
--- a/app/desktop/uwp_helper/Cargo.toml
+++ b/app/desktop/uwp_helper/Cargo.toml
@@ -8,11 +8,11 @@ build = "build.rs"
 crate-type = ["cdylib"]
 
 [dependencies.windows]
-version = "0.54.0"
+version = "0.56.0"
 features = ["System", "Foundation", "Win32_Foundation", "Security_Credentials", "Services_Store", "Foundation_Collections", "Storage"]
 
 [dependencies.tokio]
-version = "1.36.0"
+version = "1.38.0"
 features = ["macros", "rt-multi-thread"]
 
 [build-dependencies.cbindgen]
diff --git a/app/shared/build.gradle.kts b/app/shared/build.gradle.kts
index da16ad67..a740dc80 100644
--- a/app/shared/build.gradle.kts
+++ b/app/shared/build.gradle.kts
@@ -119,12 +119,12 @@ android {
 
 tasks {
     afterEvaluate {
-        named("lintAnalyzeDebug") {
-            dependsOn(
-                "generateAndroidUnitTestDebugNonAndroidBuildConfig",
-                "generateAndroidUnitTestNonAndroidBuildConfig"
-            )
-        }
+//        named("lintAnalyzeDebug") {
+//            dependsOn(
+//                "generateAndroidUnitTestDebugNonAndroidBuildConfig",
+//                "generateAndroidUnitTestNonAndroidBuildConfig"
+//            )
+//        }
         val compilationTasks = kotlin.targets.flatMap {
             buildList {
                 if (it.name != "android") {
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/config/Config.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/config/Config.kt
index 5de300d4..61dc5e3a 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/config/Config.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/config/Config.kt
@@ -9,7 +9,7 @@ import kotlin.time.toDuration
 object Config : EnvironmentConfig() {
     val SOUNDS_FOLDER by getEnv(Path("sounds"), transform = ::Path)
     val MAX_SOUND_LENGTH by getEnv(30.seconds) { it.toInt().toDuration(DurationUnit.SECONDS) }
-    val DISCORD_CLIENT_ID by environment
-    val DISCORD_CLIENT_SECRET by environment
+    val DISCORD_CLIENT_ID by this
+    val DISCORD_CLIENT_SECRET by this
     val JWT_SECRET by getEnv("verrysecurenonsense")
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index bb528c73..051c204c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,4 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension
-import org.jetbrains.kotlin.gradle.dsl.jvm.JvmTargetValidationMode
-import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
     alias(libs.plugins.kotlin.serialization) apply false
@@ -9,7 +7,7 @@ plugins {
 
 allprojects {
     group = "dev.schlaubi.tonbrett"
-    version = "1.20.0"
+    version = "1.20.1"
 
     repositories {
         mavenCentral()
@@ -23,12 +21,5 @@ subprojects {
         extensions.findByType<KotlinTopLevelExtension>()?.apply {
             jvmToolchain(22)
         }
-
-        // TODO: Remove after https://youtrack.jetbrains.com/issue/KT-66703/
-        tasks {
-            withType<KotlinJvmCompile> {
-                jvmTargetValidationMode = JvmTargetValidationMode.IGNORE
-            }
-        }
     }
 }
diff --git a/buildSrc/src/main/kotlin/multiplatform-module.gradle.kts b/buildSrc/src/main/kotlin/multiplatform-module.gradle.kts
index 864aa78d..3b051713 100644
--- a/buildSrc/src/main/kotlin/multiplatform-module.gradle.kts
+++ b/buildSrc/src/main/kotlin/multiplatform-module.gradle.kts
@@ -51,12 +51,12 @@ kotlin {
 }
 
 java {
-    targetCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_22
 }
 
 android {
     compileOptions {
-        targetCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_22
     }
 
     lint {
diff --git a/client/build.gradle.kts b/client/build.gradle.kts
index c60617ba..e6122b07 100644
--- a/client/build.gradle.kts
+++ b/client/build.gradle.kts
@@ -1,4 +1,5 @@
 import dev.schlaubi.tonbrett.gradle.androidSdk
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
     `multiplatform-module`
@@ -52,6 +53,10 @@ kotlin {
             }
         }
     }
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
+    compilerOptions {
+        freeCompilerArgs.add("-Xdont-warn-on-error-suppression")
+    }
 }
 
 android {
diff --git a/gradle.properties b/gradle.properties
index 5a89eb03..1067d495 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,3 +13,5 @@ kotlin.native.ignoreDisabledTargets=true
 systemProp.javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl
 systemProp.javax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl
 systemProp.javax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
+
+dev.schlaubi.tonbrett.no_windows=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index be0ab540..370b8bad 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ kord = "0.14.0"
 mikbot = "3.33.0"
 ksp = "2.0.0-1.0.21"
 kordex = "1.8.0-SNAPSHOT"
-android = "8.4.0"
+android = "8.4.1"
 compose = "1.6.10"
 compose-wear = "1.3.1"
 lyricist = "1.7.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cee8b1b9..a4413138 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME