From 0fd9c554e949de5892b0e24016d4f23e3c0b7734 Mon Sep 17 00:00:00 2001 From: Bendix Saeltz Date: Thu, 11 Feb 2021 10:37:55 +0100 Subject: [PATCH 1/3] Update to Scala 2.13.4 & 2.12.13 Signed-off-by: Bendix Saeltz --- build.sbt | 11 ++++++----- .../io/moia/scalaHttpClient/AwsRequestSigner.scala | 9 ++++----- .../scala/io/moia/scalaHttpClient/HttpClient.scala | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.sbt b/build.sbt index 458067d..fc9e1c7 100644 --- a/build.sbt +++ b/build.sbt @@ -5,8 +5,8 @@ lazy val root = (project in file(".")) licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0")), scmInfo := Some(ScmInfo(url("https://github.com/moia-dev/scala-http-client"), "scm:git@github.com:moia-dev/scala-http-client.git")), homepage := Some(url("https://github.com/moia-dev/scala-http-client")), - scalaVersion := "2.13.1", - crossScalaVersions := List("2.13.1", "2.12.10"), + scalaVersion := "2.13.4", + crossScalaVersions := List("2.13.4", "2.12.13"), scalacOptions ++= { CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, 12)) => scalacOptions_2_12 @@ -61,7 +61,7 @@ lazy val scalaDependencies = Seq( "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.1" ) -scapegoatVersion in ThisBuild := "1.4.4" +scapegoatVersion in ThisBuild := "1.4.7" lazy val scalacOptions_2_12 = Seq( "-unchecked", @@ -88,8 +88,9 @@ lazy val scalacOptions_2_13 = Seq( "-encoding", "UTF-8", "-Xfatal-warnings", - "-Ywarn-dead-code", - "-Ymacro-annotations" + "-Xlint:_,-byname-implicit", + "-Ymacro-annotations", + "-Ywarn-dead-code" ) lazy val sonatypeSettings = { diff --git a/src/main/scala/io/moia/scalaHttpClient/AwsRequestSigner.scala b/src/main/scala/io/moia/scalaHttpClient/AwsRequestSigner.scala index f4b0968..e3b63b9 100644 --- a/src/main/scala/io/moia/scalaHttpClient/AwsRequestSigner.scala +++ b/src/main/scala/io/moia/scalaHttpClient/AwsRequestSigner.scala @@ -1,9 +1,5 @@ package io.moia.scalaHttpClient -import java.io.InputStream -import java.net.URI -import java.util - import akka.http.scaladsl.model.HttpHeader.ParsingResult import akka.http.scaladsl.model.{HttpHeader, HttpRequest, Uri} import akka.stream.Materializer @@ -18,9 +14,12 @@ import software.amazon.awssdk.services.sts.StsClient import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider import software.amazon.awssdk.services.sts.model.AssumeRoleRequest +import java.io.InputStream +import java.net.URI +import java.util import scala.collection.compat._ import scala.collection.immutable._ -import scala.concurrent.{blocking, Future} +import scala.concurrent.{Future, blocking} import scala.jdk.CollectionConverters._ class AwsRequestSigner private (credentialsProvider: AwsCredentialsProvider, region: String)(implicit mat: Materializer) diff --git a/src/main/scala/io/moia/scalaHttpClient/HttpClient.scala b/src/main/scala/io/moia/scalaHttpClient/HttpClient.scala index 8f9ba12..ec38c6e 100644 --- a/src/main/scala/io/moia/scalaHttpClient/HttpClient.scala +++ b/src/main/scala/io/moia/scalaHttpClient/HttpClient.scala @@ -27,7 +27,7 @@ class HttpClient( httpMetrics, retryConfig, clock, - Logger.takingImplicit(LoggerFactory.getLogger(getClass.getName))((msg: String, _: NoLoggingContext) => msg), + Logger.takingImplicit(LoggerFactory.getLogger(classOf[HttpClient].getName))((msg: String, _: NoLoggingContext) => msg), awsRequestSigner ) { override def request( From 12d1308e127acad6175cf35dc73d3b5f1baec9b9 Mon Sep 17 00:00:00 2001 From: Bendix Saeltz Date: Thu, 11 Feb 2021 10:42:06 +0100 Subject: [PATCH 2/3] Update to Scala 2.13.4 & 2.12.13 Signed-off-by: Bendix Saeltz --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index fc9e1c7..7075285 100644 --- a/build.sbt +++ b/build.sbt @@ -88,7 +88,7 @@ lazy val scalacOptions_2_13 = Seq( "-encoding", "UTF-8", "-Xfatal-warnings", - "-Xlint:_,-byname-implicit", + "-Xlint:strict-unsealed-patmat", "-Ymacro-annotations", "-Ywarn-dead-code" ) From 05767f6454413c81253a653d990f76a7142bf302 Mon Sep 17 00:00:00 2001 From: Bendix Saeltz Date: Thu, 11 Feb 2021 10:45:09 +0100 Subject: [PATCH 3/3] Format Signed-off-by: Bendix Saeltz --- src/main/scala/io/moia/scalaHttpClient/AwsRequestSigner.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/io/moia/scalaHttpClient/AwsRequestSigner.scala b/src/main/scala/io/moia/scalaHttpClient/AwsRequestSigner.scala index e3b63b9..718a835 100644 --- a/src/main/scala/io/moia/scalaHttpClient/AwsRequestSigner.scala +++ b/src/main/scala/io/moia/scalaHttpClient/AwsRequestSigner.scala @@ -19,7 +19,7 @@ import java.net.URI import java.util import scala.collection.compat._ import scala.collection.immutable._ -import scala.concurrent.{Future, blocking} +import scala.concurrent.{blocking, Future} import scala.jdk.CollectionConverters._ class AwsRequestSigner private (credentialsProvider: AwsCredentialsProvider, region: String)(implicit mat: Materializer)