From 1e17f6f26018463c460ed94cb7ff9a7bb627bac5 Mon Sep 17 00:00:00 2001 From: Alex Liubymov Date: Thu, 1 Aug 2024 16:41:30 +0300 Subject: [PATCH] Update everything, update asynchttpclient to 3.0.0. (#536) --- .../rpc/http4s/clients/WsRpcDispatcherFactory.scala | 11 ++++++----- project/Versions.scala | 10 +++++----- project/build.properties | 2 +- project/project/PluginVersions.scala | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/idealingua-v1/idealingua-v1-runtime-rpc-http4s/src/main/scala/izumi/idealingua/runtime/rpc/http4s/clients/WsRpcDispatcherFactory.scala b/idealingua-v1/idealingua-v1-runtime-rpc-http4s/src/main/scala/izumi/idealingua/runtime/rpc/http4s/clients/WsRpcDispatcherFactory.scala index 78ceb989..38eac6d7 100644 --- a/idealingua-v1/idealingua-v1-runtime-rpc-http4s/src/main/scala/izumi/idealingua/runtime/rpc/http4s/clients/WsRpcDispatcherFactory.scala +++ b/idealingua-v1/idealingua-v1-runtime-rpc-http4s/src/main/scala/izumi/idealingua/runtime/rpc/http4s/clients/WsRpcDispatcherFactory.scala @@ -19,6 +19,7 @@ import org.asynchttpclient.ws.{WebSocket, WebSocketListener, WebSocketUpgradeHan import org.asynchttpclient.{DefaultAsyncHttpClient, DefaultAsyncHttpClientConfig} import org.http4s.Uri +import java.time.Duration import java.util.UUID import java.util.concurrent.atomic.AtomicReference import scala.concurrent.duration.{DurationInt, FiniteDuration} @@ -174,11 +175,11 @@ class WsRpcDispatcherFactory[F[+_, +_]: Async2: Temporal2: Primitives2: UnsafeRu .setWebSocketMaxFrameSize(64 * 1024 * 1024 * 8) // increase frame size for 64MB .setKeepAlive(true) .setSoKeepAlive(true) - .setRequestTimeout(30 * 1000) // 60 seconds is default - .setPooledConnectionIdleTimeout(60 * 1000) // 60 seconds is default - .setConnectTimeout(30 * 1000) // 5 seconds is default - .setReadTimeout(60 * 1000) // 60 seconds is default - .setShutdownTimeout(15 * 1000) // 15 seconds is default + .setRequestTimeout(Duration.ofSeconds(30)) // 60 seconds is default + .setPooledConnectionIdleTimeout(Duration.ofSeconds(60)) // 60 seconds is default + .setConnectTimeout(Duration.ofSeconds(30)) // 5 seconds is default + .setReadTimeout(Duration.ofSeconds(60)) // 60 seconds is default + .setShutdownTimeout(Duration.ofSeconds(15)) // 15 seconds is default .build() ) }) diff --git a/project/Versions.scala b/project/Versions.scala index 3511aacf..25d4e95c 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -1,26 +1,26 @@ object V { // foundation - val scalatest = "3.2.18" + val scalatest = "3.2.19" val http4s = "0.23.27" val http4s_blaze = "0.23.16" - val scalameta = "4.9.5" // Not available for Scala 3 yet - val fastparse = "3.1.0" // 3.0.0 is available for Scala 3 + val scalameta = "4.9.9" // Not available for Scala 3 yet + val fastparse = "3.1.1" // 3.0.0 is available for Scala 3 val scala_xml = "2.3.0" val kind_projector = "0.13.3" val circe_derivation = "0.13.0-M5" - val circe_generic_extras = "0.14.3" + val circe_generic_extras = "0.14.4" val scala_java_time = "2.6.0" // java-only dependencies below // java, we need it bcs http4s ws client isn't ready yet - val asynchttpclient = "2.12.3" + val asynchttpclient = "3.0.0" val slf4j = "1.7.30" val typesafe_config = "1.4.3" diff --git a/project/build.properties b/project/build.properties index be54e776..136f452e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.10.0 +sbt.version = 1.10.1 diff --git a/project/project/PluginVersions.scala b/project/project/PluginVersions.scala index 3816d62a..3dcdcf95 100644 --- a/project/project/PluginVersions.scala +++ b/project/project/PluginVersions.scala @@ -1,6 +1,6 @@ object PV { val izumi = "1.2.11" - val sbt_scoverage = "2.0.12" + val sbt_scoverage = "2.1.0" val sbt_pgp = "2.2.1" }