Skip to content

Commit fe047f3

Browse files
bump: scala-library 2.13.11 (was 2.13.10) (#1806)
* Explicit implicit types required with 2.13.11 --------- Co-authored-by: Johan Andrén <[email protected]>
1 parent 8a5d7db commit fe047f3

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

codegen/src/main/scala/akka/grpc/gen/scaladsl/Service.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ object Service {
3232
serviceDescriptor: ServiceDescriptor,
3333
serverPowerApi: Boolean,
3434
usePlayActions: Boolean): Service = {
35-
implicit val ops =
35+
implicit val ops: DescriptorImplicits =
3636
DescriptorImplicits.fromCodeGenRequest(generatorParams, request)
3737
import ops._
3838

codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import akka.actor.ClassicActorSystemProvider
1717
import akka.annotation.ApiMayChange
1818
import akka.http.scaladsl.model
1919
import akka.stream.SystemMaterializer
20+
import akka.stream.Materializer
2021

2122
import akka.grpc.internal.TelemetryExtension
2223

@@ -107,7 +108,7 @@ object @{serviceName}Handler {
107108
* Registering a gRPC service under a custom prefix is not widely supported and strongly discouraged by the specification.
108109
*/
109110
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]] = {
110-
implicit val mat = SystemMaterializer(system).materializer
111+
implicit val mat: Materializer = SystemMaterializer(system).materializer
111112
implicit val ec: ExecutionContext = mat.executionContext
112113
val spi = TelemetryExtension(system).spi
113114

interop-tests/src/test/scala/akka/grpc/scaladsl/PowerApiSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ abstract class PowerApiSpec(backend: String)
5252
with BeforeAndAfter
5353
with BeforeAndAfterAll {
5454

55-
override implicit val patienceConfig = PatienceConfig(5.seconds, Span(10, org.scalatest.time.Millis))
55+
override implicit val patienceConfig: PatienceConfig = PatienceConfig(5.seconds, Span(10, org.scalatest.time.Millis))
5656

5757
val server =
5858
Http().newServerAt("localhost", 0).bind(GreeterServicePowerApiHandler(new PowerGreeterServiceImpl())).futureValue

plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import scala.concurrent.duration._
2727
@RunWith(classOf[JUnitRunner])
2828
class ErrorReportingSpec extends AnyWordSpec with Matchers with ScalaFutures with BeforeAndAfterAll {
2929

30-
override implicit val patienceConfig = PatienceConfig(5.seconds, Span(100, org.scalatest.time.Millis))
30+
override implicit val patienceConfig: PatienceConfig = PatienceConfig(5.seconds, Span(100, org.scalatest.time.Millis))
3131

3232
implicit val system: ActorSystem = ActorSystem()
3333

project/Dependencies.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import buildinfo.BuildInfo
77
object Dependencies {
88
object Versions {
99
val scala212 = "2.12.18"
10-
val scala213 = "2.13.10"
10+
val scala213 = "2.13.11"
1111
val scala3 = "3.2.2"
1212

1313
// the order in the list is important because the head will be considered the default.

runtime/src/test/scala/akka/grpc/internal/AkkaDiscoveryNameResolverProviderSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class AkkaDiscoveryNameResolverProviderSpec
3636
with Matchers
3737
with ScalaFutures {
3838

39-
implicit override val patienceConfig =
39+
implicit override val patienceConfig: PatienceConfig =
4040
PatienceConfig(timeout = scaled(Span(2, Seconds)), interval = scaled(Span(5, Millis)))
4141

4242
"AkkaDiscoveryNameResolverProviderSpec" should {

runtime/src/test/scala/akka/grpc/internal/AkkaDiscoveryNameResolverSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class AkkaDiscoveryNameResolverSpec
2323
with Matchers
2424
with ScalaFutures {
2525
implicit val ex: ExecutionContext = system.dispatcher
26-
implicit override val patienceConfig =
26+
implicit override val patienceConfig: PatienceConfig =
2727
PatienceConfig(timeout = scaled(Span(2, Seconds)), interval = scaled(Span(5, Millis)))
2828

2929
"The AkkaDiscovery-backed NameResolver" should {

runtime/src/test/scala/akka/grpc/scaladsl/GrpcExceptionHandlerSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import scala.concurrent.{ ExecutionException, Future }
2222

2323
class GrpcExceptionHandlerSpec extends AnyWordSpec with Matchers with ScalaFutures with BeforeAndAfterAll {
2424
implicit val system: ActorSystem = ActorSystem("Test")
25-
implicit override val patienceConfig =
25+
implicit override val patienceConfig: PatienceConfig =
2626
PatienceConfig(timeout = scaled(Span(2, Seconds)), interval = scaled(Span(5, Millis)))
2727
implicit val writer: GrpcProtocol.GrpcProtocolWriter = GrpcProtocolNative.newWriter(Identity)
2828

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
scalaVersion := "2.13.10"
1+
scalaVersion := "2.13.11"
22

33
resolvers += Resolver.sonatypeRepo("staging")
44

@@ -9,5 +9,4 @@ enablePlugins(AkkaGrpcPlugin)
99
libraryDependencies ++= Seq(
1010
// just to make sure it works with Scala 3 artifacts
1111
"com.typesafe.akka" %% "akka-http" % "10.5.0",
12-
"org.scalatest" %% "scalatest" % "3.2.12" % "test"
13-
)
12+
"org.scalatest" %% "scalatest" % "3.2.12" % "test")

sbt-plugin/src/sbt-test/scala-2_13/01-basic-client-server/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import org.scalatest.time.{ Span, Millis, Seconds }
1616
import org.scalatest.wordspec.AnyWordSpec
1717

1818
class GreeterServiceSpec extends AnyWordSpec with Matchers with ScalaFutures {
19-
implicit val system = ActorSystem("GreeterServiceSpec")
19+
implicit val system: ActorSystem = ActorSystem("GreeterServiceSpec")
2020

2121
val binding = Http()
2222
.newServerAt("localhost", 0)

0 commit comments

Comments
 (0)