Skip to content

Commit 276d656

Browse files
committed
Fixed scala2.13 linting errors
1 parent a353f2d commit 276d656

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

modules/http4s-ember/.js/src/main/scala/PlatformCompanion.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ private[http4s] abstract class PlatformCompanion[F[_]: Async: Files: Env]
102102
"Cannot find where/how to connect using the provided config!"
103103
).raiseError
104104
)
105-
case Some((cluster, server, auth)) =>
105+
case Some((clusterData, server, auth)) =>
106106
ssl(
107-
caFile = cluster.`certificate-authority`,
108-
caData = cluster.`certificate-authority-data`,
107+
caFile = clusterData.`certificate-authority`,
108+
caData = clusterData.`certificate-authority-data`,
109109
clientCert = auth.`client-certificate-data`,
110110
clientCertFile = auth.`client-certificate`,
111111
clientKey = auth.`client-key-data`,

modules/http4s-ember/.native/src/main/scala/PlatformCompanion.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ private[http4s] abstract class PlatformCompanion[F[_]: Async: Files: Env]
9595
"Cannot find where/how to connect using the provided config!"
9696
).raiseError
9797
)
98-
case Some((cluster, server, auth)) =>
98+
case Some((clusterData, server, auth)) =>
9999
client(
100-
caFile = cluster.`certificate-authority`,
101-
caData = cluster.`certificate-authority-data`,
100+
caFile = clusterData.`certificate-authority`,
101+
caData = clusterData.`certificate-authority-data`,
102102
clientCert = auth.`client-certificate-data`,
103103
clientCertFile = auth.`client-certificate`,
104104
clientKey = auth.`client-key-data`,

modules/http4s/.jvm/src/main/scala/JVMPlatform.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ private[http4s] abstract class JVMPlatform[F[_]](implicit
6868
"Cannot find where/how to connect using the provided config!"
6969
).raiseError
7070
)
71-
case Some((cluster, server, auth)) =>
72-
val sslContext = F.blocking(SSLContexts.from(cluster, auth))
71+
case Some((clusterData, server, auth)) =>
72+
val sslContext = F.blocking(SSLContexts.from(clusterData, auth))
7373

7474
Resource
7575
.eval(sslContext)

modules/sttp/.jvm/src/main/scala/SttpJVM.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ private[client] trait SttpJVM[F[_]] {
5959
throw new IllegalArgumentException(
6060
"Cannot find where/how to connect using the provided config!"
6161
)
62-
case Some((cluster, server, auth)) =>
63-
val ssl = SSLContexts.from(cluster, auth)
62+
case Some((clusterData, server, auth)) =>
63+
val ssl = SSLContexts.from(clusterData, auth)
6464
HttpClient[SttpF[F, *]](
6565
server,
6666
SttpKBackend[F, T](buildWithSSLContext(ssl)),
@@ -124,8 +124,8 @@ private[client] trait SttpJVM[F[_]] {
124124
val str = readFile(config)
125125
manifest.parse[Config](str) match {
126126
case Left(error) => throw error
127-
case Right(config) =>
128-
fromConfig(config, context = context, cluster = cluster)
127+
case Right(configData) =>
128+
fromConfig(configData, context = context, cluster = cluster)
129129
}
130130
}
131131

0 commit comments

Comments
 (0)