From ced33442e1440e479549c4569678d4ea9d157808 Mon Sep 17 00:00:00 2001 From: lepicekmichal Date: Fri, 16 Aug 2024 21:42:38 +0200 Subject: [PATCH] update dependencies and prepare for ktor 3 --- README.md | 3 ++- gradle.properties | 2 +- gradle/libs.versions.toml | 12 +++++++----- .../signalrkore/transports/WebSocketTransport.kt | 3 +-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 953484c..430338a 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ # SignalRKore [![Maven Central](https://img.shields.io/maven-central/v/eu.lepicekmichal.signalrkore/signalrkore)](https://mvnrepository.com/artifact/eu.lepicekmichal.signalrkore) -[![Kotlin](https://img.shields.io/badge/kotlin-2.0.0-blue.svg?logo=kotlin)](http://kotlinlang.org) +[![Kotlin](https://img.shields.io/badge/kotlin-2.0.10-blue.svg?logo=kotlin)](http://kotlinlang.org) [![GitHub License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) +[![Kotlin Weekly](https://img.shields.io/badge/Kotlin%20Weekly-%23416-purple?style=flat)](https://mailchi.mp/kotlinweekly/kotlin-weekly-416) ![badge-android](http://img.shields.io/badge/platform-android-6EDB8D.svg?style=flat) ![badge-jvm](http://img.shields.io/badge/platform-jvm-DB413D.svg?style=flat) diff --git a/gradle.properties b/gradle.properties index 5c8184f..70ec75c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ RELEASE_SIGNING_ENABLED=true GROUP=eu.lepicekmichal.signalrkore POM_ARTIFACT_ID=signalrkore -VERSION_NAME=0.8.4 +VERSION_NAME=0.8.6 POM_NAME=SignalR Kore POM_DESCRIPTION=Connect to SignalR Core server with library written in Kotlin and coroutines. diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 511c9fc..7465de0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,16 +1,18 @@ [versions] -gradle = "8.4.2" -kotlin = "2.0.0" -kotlinxSerializationJson = "1.6.3" +gradle = "8.5.2" +kotlin = "2.0.10" +kotlinxCoroutinesTest = "1.8.0" +kotlinxSerializationJson = "1.7.1" kotlinxDatetime = "0.6.0" -ktorClientCore = "2.3.11" +ktorClientCore = "2.3.12" okhttp = "4.12.0" okio = "3.9.0" -vanniktech = "0.28.0" +vanniktech = "0.29.0" [libraries] gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" } kotlin-stdlib-common = { module = "org.jetbrains.kotlin:kotlin-stdlib-common", version.ref = "kotlin" } +kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesTest" } kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" } ktor-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktorClientCore" } diff --git a/signalrkore/src/commonMain/kotlin/eu/lepicekmichal/signalrkore/transports/WebSocketTransport.kt b/signalrkore/src/commonMain/kotlin/eu/lepicekmichal/signalrkore/transports/WebSocketTransport.kt index fd0745b..76ce566 100644 --- a/signalrkore/src/commonMain/kotlin/eu/lepicekmichal/signalrkore/transports/WebSocketTransport.kt +++ b/signalrkore/src/commonMain/kotlin/eu/lepicekmichal/signalrkore/transports/WebSocketTransport.kt @@ -5,7 +5,6 @@ import eu.lepicekmichal.signalrkore.RECORD_SEPARATOR import eu.lepicekmichal.signalrkore.Transport import eu.lepicekmichal.signalrkore.utils.headers import io.ktor.client.HttpClient -import io.ktor.client.plugins.HttpTimeout import io.ktor.client.plugins.timeout import io.ktor.client.plugins.websocket.webSocketSession import io.ktor.utils.io.core.toByteArray @@ -42,7 +41,7 @@ internal class WebSocketTransport( headers(this@WebSocketTransport.headers) timeout { - requestTimeoutMillis = HttpTimeout.INFINITE_TIMEOUT_MS + requestTimeoutMillis = Long.MAX_VALUE // HttpTimeout.INFINITE_TIMEOUT_MS or HttpTimeoutConfig.INFINITE_TIMEOUT_MS } }