From 2111232f42a84935320da2e2771ea171c48fd754 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 7 Dec 2024 14:27:47 -0500
Subject: [PATCH] Update kotlin monorepo to v2.1.0 (#1170)

* Update kotlin monorepo to v2.1.0

* Fix build warnings

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Syer10 <syer10@users.noreply.github.com>
---
 gradle/libs.versions.toml                     |  2 +-
 .../suwayomi/tachidesk/server/ServerSetup.kt  | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index db9c4936..db34c17f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.0.21"
+kotlin = "2.1.0"
 coroutines = "1.9.0"
 serialization = "1.7.3"
 okhttp = "5.0.0-alpha.14" # Major version is locked by Tachiyomi extensions
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt
index 9d4aafc4..73f4785b 100644
--- a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt
@@ -69,6 +69,15 @@ class ApplicationDirs(
     val mangaDownloadsRoot get() = "$downloadsRoot/mangas"
 }
 
+data class ProxySettings(
+    val proxyEnabled: Boolean,
+    val socksProxyVersion: Int,
+    val proxyHost: String,
+    val proxyPort: String,
+    val proxyUsername: String,
+    val proxyPassword: String,
+)
+
 val serverConfig: ServerConfig by lazy { GlobalConfigManager.module() }
 
 val androidCompat by lazy { AndroidCompat() }
@@ -238,7 +247,7 @@ fun applicationSetup() {
 
     // socks proxy settings
     serverConfig.subscribeTo(
-        combine(
+        combine<Any, ProxySettings>(
             serverConfig.socksProxyEnabled,
             serverConfig.socksProxyVersion,
             serverConfig.socksProxyHost,
@@ -246,14 +255,6 @@ fun applicationSetup() {
             serverConfig.socksProxyUsername,
             serverConfig.socksProxyPassword,
         ) { vargs ->
-            data class ProxySettings(
-                val proxyEnabled: Boolean,
-                val socksProxyVersion: Int,
-                val proxyHost: String,
-                val proxyPort: String,
-                val proxyUsername: String,
-                val proxyPassword: String,
-            )
             ProxySettings(
                 vargs[0] as Boolean,
                 vargs[1] as Int,