Skip to content

Commit

Permalink
bump: scala-library 2.13.11 (was 2.13.10) (#1806)
Browse files Browse the repository at this point in the history
* Explicit implicit types required with 2.13.11
---------

Co-authored-by: Johan Andrén <johan@markatta.com>
  • Loading branch information
scala-steward and johanandren committed Jun 30, 2023
1 parent 8a5d7db commit fe047f3
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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._

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scalaVersion := "2.13.10"
scalaVersion := "2.13.11"

resolvers += Resolver.sonatypeRepo("staging")

Expand All @@ -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")
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit fe047f3

Please sign in to comment.