diff --git a/build.sbt b/build.sbt index c396235..c1eb128 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,7 @@ ThisBuild / resolvers += Resolver.mavenLocal ThisBuild / Test / javaOptions += "-Dcom.linecorp.armeria.verboseResponses=true -Dcom.linecorp.armeria.verboseExceptions=always" val versions = new { - val armeria = "1.30.1" + val armeria = "1.31.0" val fs2 = "3.11.0" val http4s = "1.0.0-M43" val log4cats = "2.7.0" diff --git a/server/src/main/scala/org/http4s/armeria/server/ArmeriaServerBuilder.scala b/server/src/main/scala/org/http4s/armeria/server/ArmeriaServerBuilder.scala index 4110c1e..b237dff 100644 --- a/server/src/main/scala/org/http4s/armeria/server/ArmeriaServerBuilder.scala +++ b/server/src/main/scala/org/http4s/armeria/server/ArmeriaServerBuilder.scala @@ -21,7 +21,13 @@ import cats.syntax.applicative._ import cats.syntax.flatMap._ import cats.syntax.functor._ import com.linecorp.armeria.common.util.Version -import com.linecorp.armeria.common.{HttpRequest, HttpResponse, SessionProtocol} +import com.linecorp.armeria.common.{ + HttpRequest, + HttpResponse, + SessionProtocol, + TlsKeyPair, + TlsProvider +} import com.linecorp.armeria.server.{ HttpService, HttpServiceWithRoutes, @@ -258,7 +264,12 @@ sealed class ArmeriaServerBuilder[F[_]] private ( * [[withTlsCustomizer]] */ def withTls(keyCertChainFile: File, keyFile: File, keyPassword: Option[String]): Self = - atBuild(_.tls(keyCertChainFile, keyFile, keyPassword.orNull)) + atBuild( + _.tlsProvider( + TlsProvider + .builder() + .keyPair(TlsKeyPair.of(keyFile, keyPassword.orNull, keyCertChainFile)) + .build())) /** Configures SSL or TLS of this [[com.linecorp.armeria.server.Server]] with the specified * `keyCertChainInputStream`, `keyInputStream` and `keyPassword`. @@ -276,7 +287,11 @@ sealed class ArmeriaServerBuilder[F[_]] private ( .both(keyInputStream) .use { case (keyCertChain, key) => F.delay { - ab.tls(keyCertChain, key, keyPassword.orNull) + ab.tlsProvider( + TlsProvider + .builder() + .keyPair(TlsKeyPair.of(key, keyPassword.orNull, keyCertChain)) + .build()) } } }) @@ -288,7 +303,12 @@ sealed class ArmeriaServerBuilder[F[_]] private ( * [[withTlsCustomizer]] */ def withTls(key: PrivateKey, keyCertChain: X509Certificate*): Self = - atBuild(_.tls(key, keyCertChain: _*)) + atBuild( + _.tlsProvider( + TlsProvider + .builder() + .keyPair(TlsKeyPair.of(key, keyCertChain: _*)) + .build())) /** Configures SSL or TLS of this [[com.linecorp.armeria.server.Server]] with the specified * [[javax.net.ssl.KeyManagerFactory]].