vaultwarden
/
keyguard-app-Bitwarden-Vaultwarden
mirror of https://github.com/AChep/keyguard-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Bump ktor to 3.0 and kamel to 1.0.1

This commit is contained in:
Artem Chepurnyi 2024-10-23 13:36:42 +03:00
parent 9fe29c8dae
commit 94cb7866dd
No known key found for this signature in database
GPG Key ID: FAC37D0CF674043E
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/api/login.kt
View File

@ -37,6 +37,7 @@ import io.ktor.http.ContentType
import io.ktor.http.Parameters import io.ktor.http.Parameters
import io.ktor.http.contentType import io.ktor.http.contentType
import io.ktor.util.* import io.ktor.util.*
import io.ktor.utils.io.InternalAPI
import kotlinx.serialization.encodeToString import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonObject

4
common/src/jvmMain/kotlin/com/artemchep/keyguard/di/GlobalModuleJvm.kt
View File

@ -1334,7 +1334,7 @@ fun globalModuleJvm() = DI.Module(
register(ContentType.Application.Json, KotlinxSerializationConverter(json)) register(ContentType.Application.Json, KotlinxSerializationConverter(json))
} }
install(WebSockets) { install(WebSockets) {
pingInterval = 20_000 pingIntervalMillis = 20_000
} }
install(HttpCache) { install(HttpCache) {
// In memory. // In memory.
@ -1366,7 +1366,7 @@ fun globalModuleJvm() = DI.Module(
register(ContentType.Application.Json, KotlinxSerializationConverter(json)) register(ContentType.Application.Json, KotlinxSerializationConverter(json))
} }
install(WebSockets) { install(WebSockets) {
pingInterval = 20_000 pingIntervalMillis = 20_000
} }
install(HttpCache) { install(HttpCache) {
// In memory. // In memory.

6
gradle/libs.versions.toml
View File

@ -66,7 +66,7 @@ googleServicesPlugin = "4.4.2"
# https://github.com/ch4rl3x/HtmlText # https://github.com/ch4rl3x/HtmlText
htmlText = "2.0.0-beta01" htmlText = "2.0.0-beta01"
# https://github.com/Kamel-Media/Kamel # https://github.com/Kamel-Media/Kamel
kamel = "0.9.5" kamel = "1.0.1"
# https://github.com/kdrag0n/colorkt # https://github.com/kdrag0n/colorkt
kdrag0nColorKt = "1.0.5" kdrag0nColorKt = "1.0.5"
# https://github.com/Kodein-Framework/Kodein-DI # https://github.com/Kodein-Framework/Kodein-DI
@ -91,7 +91,7 @@ ktlint = "0.50.0"
ktlintPlugin = "12.1.1" ktlintPlugin = "12.1.1"
# https://github.com/ktorio/ktor # https://github.com/ktorio/ktor
# Keep in sync with https://github.com/Kamel-Media/Kamel/blob/main/gradle/libs.versions.toml#L24 # Keep in sync with https://github.com/Kamel-Media/Kamel/blob/main/gradle/libs.versions.toml#L24
ktor = "2.3.12" ktor = "3.0.0"
# https://github.com/skydoves/landscapist # https://github.com/skydoves/landscapist
landscapist = "2.4.1" landscapist = "2.4.1"
# https://github.com/cashapp/licensee # https://github.com/cashapp/licensee
@ -211,7 +211,7 @@ halilibo-richtext-markdown = { module = "com.halilibo.compose-richtext:richtext-
halilibo-richtext-ui-material3 = { module = "com.halilibo.compose-richtext:richtext-ui-material3", version.ref = "richtext" } halilibo-richtext-ui-material3 = { module = "com.halilibo.compose-richtext:richtext-ui-material3", version.ref = "richtext" }
harawata-appdirs = { module = "net.harawata:appdirs", version.ref = "appDirs" } harawata-appdirs = { module = "net.harawata:appdirs", version.ref = "appDirs" }
html-text = { module = "de.charlex.compose.material3:material3-html-text", version.ref = "htmlText" } html-text = { module = "de.charlex.compose.material3:material3-html-text", version.ref = "htmlText" }
kamel-image = { module = "media.kamel:kamel-image", version.ref = "kamel" } kamel-image = { module = "media.kamel:kamel-image-default", version.ref = "kamel" }
kdrag0n-colorkt = { module = "dev.kdrag0n:colorkt", version.ref = "kdrag0nColorKt" } kdrag0n-colorkt = { module = "dev.kdrag0n:colorkt", version.ref = "kdrag0nColorKt" }
kodein-kodein-di = { module = "org.kodein.di:kodein-di", version.ref = "kodeinDi" } kodein-kodein-di = { module = "org.kodein.di:kodein-di", version.ref = "kodeinDi" }
kodein-kodein-di-framework-android-x-viewmodel-savedstate = { module = "org.kodein.di:kodein-di-framework-android-x-viewmodel-savedstate", version.ref = "kodeinDi" } kodein-kodein-di-framework-android-x-viewmodel-savedstate = { module = "org.kodein.di:kodein-di-framework-android-x-viewmodel-savedstate", version.ref = "kodeinDi" }