bump: scala-library 2.13.15 (was 2.13.12) (#3294)

* bump: scala-library 2.13.15 (was 2.13.12) * Some changes to compile on 2.13.15: * Update wconf to let scala+java deprecated annotation through * name conflicts from surrounding scope * inferred Any type params now explicit --------- Co-authored-by: Johan Andrén <[email protected]>
akka · Dec 18, 2024 · d9565ac · d9565ac
1 parent 12d9f23
commit d9565ac
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/...storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/GCStorageStream.scala b/...storage/src/main/scala/akka/stream/alpakka/googlecloud/storage/impl/GCStorageStream.scala
@@ -148,11 +148,12 @@ import scala.concurrent.Future
         implicit val um: Unmarshaller[HttpResponse, StorageObject] = Unmarshaller.withMaterializer {
           implicit ec => implicit mat =>
             {
-              case HttpResponse(status, _, entity, _) if status.isSuccess() =>
-                Unmarshal(entity).to[StorageObject]
-              case HttpResponse(status, _, entity, _) =>
-                Unmarshal(entity).to[String].flatMap { errorString =>
-                  Future.failed(new RuntimeException(s"Uploading part failed with status $status: $errorString"))
+              case HttpResponse(responseStatus, _, responseEntity, _) if responseStatus.isSuccess() =>
+                Unmarshal(responseEntity).to[StorageObject]
+              case HttpResponse(responseStatus, _, responseEntity, _) =>
+                Unmarshal(responseEntity).to[String].flatMap { errorString =>
+                  Future
+                    .failed(new RuntimeException(s"Uploading part failed with status $responseStatus: $errorString"))
                 }
             }: PartialFunction[HttpResponse, Future[StorageObject]]
         }.withDefaultRetry

diff --git a/jakarta-jms/src/test/scala/akka/stream/alpakka/jakartajms/impl/JmsMessageProducerSpec.scala b/jakarta-jms/src/test/scala/akka/stream/alpakka/jakartajms/impl/JmsMessageProducerSpec.scala
@@ -111,7 +111,7 @@ class JmsMessageProducerSpec extends JmsSpec {
       val jmsProducer = JmsMessageProducer(jmsSession, settings, 0)
       jmsProducer.createMessage(
         JmsMapMessage(
-          Map(
+          Map[String, Any](
             "string" -> "string",
             "int" -> 1,
             "boolean" -> true,

diff --git a/jakarta-jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala b/jakarta-jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala
@@ -1236,7 +1236,7 @@ class JmsConnectorsSpec extends JmsSpec {
     val respondStreamControl: JmsConsumerControl =
       JmsConsumer(JmsConsumerSettings(system, connectionFactory).withQueue("test"))
         .collect {
-          case message: TextMessage => JmsTextMessage(message)
+          case textMessage: TextMessage => JmsTextMessage(textMessage)
         }
         .map { textMessage =>
           textMessage.headers.foldLeft(JmsTextMessage(textMessage.body.reverse)) {

diff --git a/jms/src/test/scala/akka/stream/alpakka/jms/impl/JmsMessageProducerSpec.scala b/jms/src/test/scala/akka/stream/alpakka/jms/impl/JmsMessageProducerSpec.scala
@@ -111,7 +111,7 @@ class JmsMessageProducerSpec extends JmsSpec {
       val jmsProducer = JmsMessageProducer(jmsSession, settings, 0)
       jmsProducer.createMessage(
         JmsMapMessage(
-          Map(
+          Map[String, Any](
             "string" -> "string",
             "int" -> 1,
             "boolean" -> true,

diff --git a/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala b/jms/src/test/scala/docs/scaladsl/JmsConnectorsSpec.scala
@@ -1228,7 +1228,7 @@ class JmsConnectorsSpec extends JmsSpec {
     val respondStreamControl: JmsConsumerControl =
       JmsConsumer(JmsConsumerSettings(system, connectionFactory).withQueue("test"))
         .collect {
-          case message: TextMessage => JmsTextMessage(message)
+          case textMessage: TextMessage => JmsTextMessage(textMessage)
         }
         .map { textMessage =>
           textMessage.headers.foldLeft(JmsTextMessage(textMessage.body.reverse)) {

diff --git a/project/Common.scala b/project/Common.scala
@@ -60,8 +60,9 @@ object Common extends AutoPlugin {
           "-deprecation",
           "-Xlint",
           "-Ywarn-dead-code",
+          "-Wconf:cat=lint-deprecation:s",
           "-release",
-          "8"
+          "11"
         ),
       scalacOptions ++= (scalaVersion.value match {
           case Dependencies.Scala213

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -9,7 +9,7 @@ object Dependencies {
 
   val CronBuild = sys.env.get("GITHUB_EVENT_NAME").contains("schedule")
 
-  val Scala213 = "2.13.12" // update even in link-validator.conf
+  val Scala213 = "2.13.15" // update even in link-validator.conf
   val Scala3 = "3.3.4"
   val Scala2Versions = Seq(Scala213)
   val ScalaVersions = Dependencies.Scala2Versions :+ Dependencies.Scala3