From fe047f313efc43991db8cdbe5bd7bcd82b226323 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 30 Jun 2023 09:10:34 +0200 Subject: [PATCH] bump: scala-library 2.13.11 (was 2.13.10) (#1806) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Explicit implicit types required with 2.13.11 --------- Co-authored-by: Johan Andrén --- codegen/src/main/scala/akka/grpc/gen/scaladsl/Service.scala | 2 +- .../src/main/twirl/templates/ScalaServer/Handler.scala.txt | 3 ++- .../src/test/scala/akka/grpc/scaladsl/PowerApiSpec.scala | 2 +- .../scala/example/myapp/helloworld/ErrorReportingSpec.scala | 2 +- project/Dependencies.scala | 2 +- .../internal/AkkaDiscoveryNameResolverProviderSpec.scala | 2 +- .../akka/grpc/internal/AkkaDiscoveryNameResolverSpec.scala | 2 +- .../scala/akka/grpc/scaladsl/GrpcExceptionHandlerSpec.scala | 2 +- .../src/sbt-test/scala-2_13/01-basic-client-server/build.sbt | 5 ++--- .../scala/example/myapp/helloworld/GreeterServiceSpec.scala | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/codegen/src/main/scala/akka/grpc/gen/scaladsl/Service.scala b/codegen/src/main/scala/akka/grpc/gen/scaladsl/Service.scala index e038ee1f5..ad15cf296 100644 --- a/codegen/src/main/scala/akka/grpc/gen/scaladsl/Service.scala +++ b/codegen/src/main/scala/akka/grpc/gen/scaladsl/Service.scala @@ -32,7 +32,7 @@ object Service { serviceDescriptor: ServiceDescriptor, serverPowerApi: Boolean, usePlayActions: Boolean): Service = { - implicit val ops = + implicit val ops: DescriptorImplicits = DescriptorImplicits.fromCodeGenRequest(generatorParams, request) import ops._ diff --git a/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt b/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt index 92d09d565..0ef1207d0 100644 --- a/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt +++ b/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt @@ -17,6 +17,7 @@ import akka.actor.ClassicActorSystemProvider import akka.annotation.ApiMayChange import akka.http.scaladsl.model import akka.stream.SystemMaterializer +import akka.stream.Materializer import akka.grpc.internal.TelemetryExtension @@ -107,7 +108,7 @@ object @{serviceName}Handler { * Registering a gRPC service under a custom prefix is not widely supported and strongly discouraged by the specification. */ def partial(implementation: @serviceName, prefix: String = @{service.name}.name, eHandler: ActorSystem => PartialFunction[Throwable, Trailers] = GrpcExceptionHandler.defaultMapper)(implicit system: ClassicActorSystemProvider): PartialFunction[model.HttpRequest, scala.concurrent.Future[model.HttpResponse]] = { - implicit val mat = SystemMaterializer(system).materializer + implicit val mat: Materializer = SystemMaterializer(system).materializer implicit val ec: ExecutionContext = mat.executionContext val spi = TelemetryExtension(system).spi diff --git a/interop-tests/src/test/scala/akka/grpc/scaladsl/PowerApiSpec.scala b/interop-tests/src/test/scala/akka/grpc/scaladsl/PowerApiSpec.scala index f0671a5d1..28e95ce7d 100644 --- a/interop-tests/src/test/scala/akka/grpc/scaladsl/PowerApiSpec.scala +++ b/interop-tests/src/test/scala/akka/grpc/scaladsl/PowerApiSpec.scala @@ -52,7 +52,7 @@ abstract class PowerApiSpec(backend: String) with BeforeAndAfter with BeforeAndAfterAll { - override implicit val patienceConfig = PatienceConfig(5.seconds, Span(10, org.scalatest.time.Millis)) + override implicit val patienceConfig: PatienceConfig = PatienceConfig(5.seconds, Span(10, org.scalatest.time.Millis)) val server = Http().newServerAt("localhost", 0).bind(GreeterServicePowerApiHandler(new PowerGreeterServiceImpl())).futureValue diff --git a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala index 441c54752..b6a4606bd 100644 --- a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala +++ b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala @@ -27,7 +27,7 @@ import scala.concurrent.duration._ @RunWith(classOf[JUnitRunner]) class ErrorReportingSpec extends AnyWordSpec with Matchers with ScalaFutures with BeforeAndAfterAll { - override implicit val patienceConfig = PatienceConfig(5.seconds, Span(100, org.scalatest.time.Millis)) + override implicit val patienceConfig: PatienceConfig = PatienceConfig(5.seconds, Span(100, org.scalatest.time.Millis)) implicit val system: ActorSystem = ActorSystem() diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c68caa57e..dcc8e6244 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,7 +7,7 @@ import buildinfo.BuildInfo object Dependencies { object Versions { val scala212 = "2.12.18" - val scala213 = "2.13.10" + val scala213 = "2.13.11" val scala3 = "3.2.2" // the order in the list is important because the head will be considered the default. diff --git a/runtime/src/test/scala/akka/grpc/internal/AkkaDiscoveryNameResolverProviderSpec.scala b/runtime/src/test/scala/akka/grpc/internal/AkkaDiscoveryNameResolverProviderSpec.scala index ce48b0c84..936050c36 100644 --- a/runtime/src/test/scala/akka/grpc/internal/AkkaDiscoveryNameResolverProviderSpec.scala +++ b/runtime/src/test/scala/akka/grpc/internal/AkkaDiscoveryNameResolverProviderSpec.scala @@ -36,7 +36,7 @@ class AkkaDiscoveryNameResolverProviderSpec with Matchers with ScalaFutures { - implicit override val patienceConfig = + implicit override val patienceConfig: PatienceConfig = PatienceConfig(timeout = scaled(Span(2, Seconds)), interval = scaled(Span(5, Millis))) "AkkaDiscoveryNameResolverProviderSpec" should { diff --git a/runtime/src/test/scala/akka/grpc/internal/AkkaDiscoveryNameResolverSpec.scala b/runtime/src/test/scala/akka/grpc/internal/AkkaDiscoveryNameResolverSpec.scala index 219a1106b..34ad1008b 100644 --- a/runtime/src/test/scala/akka/grpc/internal/AkkaDiscoveryNameResolverSpec.scala +++ b/runtime/src/test/scala/akka/grpc/internal/AkkaDiscoveryNameResolverSpec.scala @@ -23,7 +23,7 @@ class AkkaDiscoveryNameResolverSpec with Matchers with ScalaFutures { implicit val ex: ExecutionContext = system.dispatcher - implicit override val patienceConfig = + implicit override val patienceConfig: PatienceConfig = PatienceConfig(timeout = scaled(Span(2, Seconds)), interval = scaled(Span(5, Millis))) "The AkkaDiscovery-backed NameResolver" should { diff --git a/runtime/src/test/scala/akka/grpc/scaladsl/GrpcExceptionHandlerSpec.scala b/runtime/src/test/scala/akka/grpc/scaladsl/GrpcExceptionHandlerSpec.scala index b2180c058..75afbc9a0 100644 --- a/runtime/src/test/scala/akka/grpc/scaladsl/GrpcExceptionHandlerSpec.scala +++ b/runtime/src/test/scala/akka/grpc/scaladsl/GrpcExceptionHandlerSpec.scala @@ -22,7 +22,7 @@ import scala.concurrent.{ ExecutionException, Future } class GrpcExceptionHandlerSpec extends AnyWordSpec with Matchers with ScalaFutures with BeforeAndAfterAll { implicit val system: ActorSystem = ActorSystem("Test") - implicit override val patienceConfig = + implicit override val patienceConfig: PatienceConfig = PatienceConfig(timeout = scaled(Span(2, Seconds)), interval = scaled(Span(5, Millis))) implicit val writer: GrpcProtocol.GrpcProtocolWriter = GrpcProtocolNative.newWriter(Identity) diff --git a/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/build.sbt b/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/build.sbt index d7d76c706..8df4fcef7 100644 --- a/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/build.sbt +++ b/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.13.10" +scalaVersion := "2.13.11" resolvers += Resolver.sonatypeRepo("staging") @@ -9,5 +9,4 @@ enablePlugins(AkkaGrpcPlugin) libraryDependencies ++= Seq( // just to make sure it works with Scala 3 artifacts "com.typesafe.akka" %% "akka-http" % "10.5.0", - "org.scalatest" %% "scalatest" % "3.2.12" % "test" -) + "org.scalatest" %% "scalatest" % "3.2.12" % "test") diff --git a/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala b/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala index 6b6fb0815..a4ee9b8a1 100644 --- a/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala +++ b/sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala @@ -16,7 +16,7 @@ import org.scalatest.time.{ Span, Millis, Seconds } import org.scalatest.wordspec.AnyWordSpec class GreeterServiceSpec extends AnyWordSpec with Matchers with ScalaFutures { - implicit val system = ActorSystem("GreeterServiceSpec") + implicit val system: ActorSystem = ActorSystem("GreeterServiceSpec") val binding = Http() .newServerAt("localhost", 0)