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 <[email protected]>
Suwayomi · Dec 7, 2024 · 2111232 · 2111232
1 parent 088552b
commit 2111232
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git 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
@@ -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,22 +247,14 @@ fun applicationSetup() {
 
     // socks proxy settings
     serverConfig.subscribeTo(
-        combine(
+        combine<Any, ProxySettings>(
             serverConfig.socksProxyEnabled,
             serverConfig.socksProxyVersion,
             serverConfig.socksProxyHost,
             serverConfig.socksProxyPort,
             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,