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

Commit

Permalink
Update to Scala 2.13.4 & 2.12.13 (#152)
Browse files Browse the repository at this point in the history
* Update to Scala 2.13.4 & 2.12.13

Signed-off-by: Bendix Saeltz <bendix@saeltz.de>
  • Loading branch information
saeltz committed Feb 11, 2021
1 parent 043f894 commit 8b08fe1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
11 changes: 6 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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",
Expand All @@ -88,8 +88,9 @@ lazy val scalacOptions_2_13 = Seq(
"-encoding",
"UTF-8",
"-Xfatal-warnings",
"-Ywarn-dead-code",
"-Ymacro-annotations"
"-Xlint:strict-unsealed-patmat",
"-Ymacro-annotations",
"-Ywarn-dead-code"
)

lazy val sonatypeSettings = {
Expand Down
7 changes: 3 additions & 4 deletions src/main/scala/io/moia/scalaHttpClient/AwsRequestSigner.scala
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -18,6 +14,9 @@ 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}
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/io/moia/scalaHttpClient/HttpClient.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit 8b08fe1

Please sign in to comment.