Skip to content
This repository was archived by the owner on Oct 10, 2023. It is now read-only.

Commit 8b08fe1

Browse files
authored
Update to Scala 2.13.4 & 2.12.13 (#152)
* Update to Scala 2.13.4 & 2.12.13 Signed-off-by: Bendix Saeltz <bendix@saeltz.de>
1 parent 043f894 commit 8b08fe1

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

build.sbt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ lazy val root = (project in file("."))
55
licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0")),
66
scmInfo := Some(ScmInfo(url("https://github.com/moia-dev/scala-http-client"), "scm:git@github.com:moia-dev/scala-http-client.git")),
77
homepage := Some(url("https://github.com/moia-dev/scala-http-client")),
8-
scalaVersion := "2.13.1",
9-
crossScalaVersions := List("2.13.1", "2.12.10"),
8+
scalaVersion := "2.13.4",
9+
crossScalaVersions := List("2.13.4", "2.12.13"),
1010
scalacOptions ++= {
1111
CrossVersion.partialVersion(scalaVersion.value) match {
1212
case Some((2, 12)) => scalacOptions_2_12
@@ -61,7 +61,7 @@ lazy val scalaDependencies = Seq(
6161
"org.scala-lang.modules" %% "scala-collection-compat" % "2.4.1"
6262
)
6363

64-
scapegoatVersion in ThisBuild := "1.4.4"
64+
scapegoatVersion in ThisBuild := "1.4.7"
6565

6666
lazy val scalacOptions_2_12 = Seq(
6767
"-unchecked",
@@ -88,8 +88,9 @@ lazy val scalacOptions_2_13 = Seq(
8888
"-encoding",
8989
"UTF-8",
9090
"-Xfatal-warnings",
91-
"-Ywarn-dead-code",
92-
"-Ymacro-annotations"
91+
"-Xlint:strict-unsealed-patmat",
92+
"-Ymacro-annotations",
93+
"-Ywarn-dead-code"
9394
)
9495

9596
lazy val sonatypeSettings = {

src/main/scala/io/moia/scalaHttpClient/AwsRequestSigner.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
package io.moia.scalaHttpClient
22

3-
import java.io.InputStream
4-
import java.net.URI
5-
import java.util
6-
73
import akka.http.scaladsl.model.HttpHeader.ParsingResult
84
import akka.http.scaladsl.model.{HttpHeader, HttpRequest, Uri}
95
import akka.stream.Materializer
@@ -18,6 +14,9 @@ import software.amazon.awssdk.services.sts.StsClient
1814
import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider
1915
import software.amazon.awssdk.services.sts.model.AssumeRoleRequest
2016

17+
import java.io.InputStream
18+
import java.net.URI
19+
import java.util
2120
import scala.collection.compat._
2221
import scala.collection.immutable._
2322
import scala.concurrent.{blocking, Future}

src/main/scala/io/moia/scalaHttpClient/HttpClient.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class HttpClient(
2727
httpMetrics,
2828
retryConfig,
2929
clock,
30-
Logger.takingImplicit(LoggerFactory.getLogger(getClass.getName))((msg: String, _: NoLoggingContext) => msg),
30+
Logger.takingImplicit(LoggerFactory.getLogger(classOf[HttpClient].getName))((msg: String, _: NoLoggingContext) => msg),
3131
awsRequestSigner
3232
) {
3333
override def request(

0 commit comments

Comments
 (0)