mirror of
https://github.com/Suwayomi/Tachidesk.git
synced 2026-01-31 07:54:19 +01:00
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>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user