Update scala-compiler, scala-library, ... to 2.13.12 (#3213)

## About this PR 📦 Updates * [org.scala-lang:scala-compiler](https://github.com/scala/scala) * [org.scala-lang:scala-library](https://github.com/scala/scala) * [org.scala-lang:scala-reflect](https://github.com/scala/scala) from `2.13.11` to `2.13.12` 📜 [GitHub Release Notes](https://github.com/scala/scala/releases/tag/v2.13.12) - [Version Diff](scala/scala@v2.13.11...v2.13.12) ## Usage ✅ **Please merge!** I'll automatically update this PR to resolve conflicts as long as you don't change it yourself. If you'd like to skip this version, you can just close this PR. If you have any feedback, just mention me in the comments below. Configure Scala Steward for your repository with a [`.scala-steward.conf`](https://github.com/scala-steward-org/scala-steward/blob/b83aae55d9dd000548c3b3c9b63d79636e7b3c8b/docs/repo-specific-configuration.md) file. _Have a fantastic day writing Scala!_ <details> <summary>⚙ Adjust future updates</summary> Add this to your `.scala-steward.conf` file to ignore future updates of this dependency: ``` updates.ignore = [ { groupId = "org.scala-lang" } ] ``` Or, add this to slow down future updates of this dependency: ``` dependencyOverrides = [{ pullRequests = { frequency = "30 days" }, dependency = { groupId = "org.scala-lang" } }] ``` </details> <sup> labels: library-update </sup> --------- Co-authored-by: Taro L. Saito <[email protected]>
wvlet · Sep 11, 2023 · d1ce2e0 · d1ce2e0
1 parent b8e4838
commit d1ce2e0
Show file tree

Hide file tree

Showing 49 changed files with 468 additions and 236 deletions.
diff --git a/airframe-codec/src/main/scala/wvlet/airframe/codec/PrimitiveCodec.scala b/airframe-codec/src/main/scala/wvlet/airframe/codec/PrimitiveCodec.scala
@@ -88,7 +88,7 @@ object PrimitiveCodec {
   }
 
   object ByteCodec extends PrimitiveCodec[Byte] {
-    def surface = Primitive.Byte
+    override def surface: Surface = Primitive.Byte
 
     override def pack(p: Packer, v: Byte): Unit = {
       p.packByte(v)
@@ -131,7 +131,7 @@ object PrimitiveCodec {
   }
 
   object CharCodec extends PrimitiveCodec[Char] {
-    def surface = Primitive.Char
+    override def surface: Surface = Primitive.Char
 
     override def pack(p: Packer, v: Char): Unit = {
       p.packInt(v)
@@ -178,7 +178,7 @@ object PrimitiveCodec {
   }
 
   object ShortCodec extends PrimitiveCodec[Short] {
-    def surface = Primitive.Short
+    override def surface: Surface = Primitive.Short
     override def pack(p: Packer, v: Short): Unit = {
       p.packShort(v)
     }
@@ -220,7 +220,7 @@ object PrimitiveCodec {
   }
 
   object IntCodec extends PrimitiveCodec[Int] {
-    def surface = Primitive.Int
+    override def surface: Surface = Primitive.Int
     override def pack(p: Packer, v: Int): Unit = {
       p.packInt(v)
     }
@@ -262,7 +262,7 @@ object PrimitiveCodec {
   }
 
   object LongCodec extends PrimitiveCodec[Long] {
-    def surface = Primitive.Long
+    override def surface: Surface = Primitive.Long
 
     override def pack(p: Packer, v: Long): Unit = {
       p.packLong(v)
@@ -304,7 +304,7 @@ object PrimitiveCodec {
   }
 
   object BigIntCodec extends PrimitiveCodec[BigInt] {
-    def surface = Primitive.BigInt
+    override def surface: Surface = Primitive.BigInt
 
     override def pack(p: Packer, v: BigInt): Unit = {
       if (v.compareTo(BigInt(Long.MaxValue)) <= 0) {
@@ -350,7 +350,7 @@ object PrimitiveCodec {
   }
 
   object BigIntegerCodec extends PrimitiveCodec[java.math.BigInteger] {
-    def surface = Primitive.BigInteger
+    override def surface: Surface = Primitive.BigInteger
 
     override def pack(p: Packer, v: java.math.BigInteger): Unit = {
       if (v.compareTo(java.math.BigInteger.valueOf(Long.MaxValue)) <= 0) {
@@ -396,7 +396,7 @@ object PrimitiveCodec {
   }
 
   object StringCodec extends PrimitiveCodec[String] {
-    def surface = Primitive.String
+    override def surface: Surface = Primitive.String
 
     override def pack(p: Packer, v: String): Unit = {
       if (v == null) {
@@ -448,7 +448,7 @@ object PrimitiveCodec {
   }
 
   object BooleanCodec extends PrimitiveCodec[Boolean] {
-    def surface = Primitive.Boolean
+    override def surface: Surface = Primitive.Boolean
     override def pack(p: Packer, v: Boolean): Unit = {
       p.packBoolean(v)
     }
@@ -489,7 +489,7 @@ object PrimitiveCodec {
   }
 
   object FloatCodec extends PrimitiveCodec[Float] {
-    def surface = Primitive.Float
+    override def surface: Surface = Primitive.Float
     override def pack(p: Packer, v: Float): Unit = {
       p.packFloat(v)
     }
@@ -525,7 +525,7 @@ object PrimitiveCodec {
   }
 
   object DoubleCodec extends PrimitiveCodec[Double] {
-    def surface = Primitive.Double
+    override def surface: Surface = Primitive.Double
 
     override def pack(p: Packer, v: Double): Unit = {
       p.packDouble(v)

diff --git a/airframe-config/src/main/scala/wvlet/airframe/config/Config.scala b/airframe-config/src/main/scala/wvlet/airframe/config/Config.scala
@@ -84,7 +84,7 @@ case class ConfigChange(tpe: Surface, key: ConfigKey, default: Any, current: Any
 
 import wvlet.airframe.config.Config.*
 
-case class Config private[config] (env: ConfigEnv, holder: Map[Surface, ConfigHolder])
+case class Config(env: ConfigEnv, holder: Map[Surface, ConfigHolder])
     extends ConfigCompat
     with Iterable[ConfigHolder]
     with DesignOptions.AdditiveDesignOption[Config]

diff --git a/airframe-http-codegen/src/main/scala/wvlet/airframe/http/openapi/OpenAPI.scala b/airframe-http-codegen/src/main/scala/wvlet/airframe/http/openapi/OpenAPI.scala
@@ -97,13 +97,13 @@ object OpenAPI {
       deprecated: Option[Boolean] = None,
       allowEmptyValue: Option[Boolean] = None
   ) extends Union2[Parameter, ParameterRef] {
-    override def getElementClass = classOf[Parameter]
+    override def getElementClass: Class[_] = classOf[Parameter]
   }
 
   case class ParameterRef(
       `$ref`: String
   ) extends Union2[Parameter, ParameterRef] {
-    override def getElementClass = classOf[ParameterRef]
+    override def getElementClass: Class[_] = classOf[ParameterRef]
   }
 
   sealed trait In
@@ -139,13 +139,13 @@ object OpenAPI {
   case class OneOf(
       oneOf: Seq[SchemaOrRef]
   ) extends Union3[Schema, SchemaRef, OneOf] {
-    override def getElementClass = classOf[OneOf]
+    override def getElementClass: Class[_] = classOf[OneOf]
   }
 
   case class SchemaRef(
       `$ref`: String
   ) extends Union3[Schema, SchemaRef, OneOf] {
-    override def getElementClass = classOf[SchemaRef]
+    override def getElementClass: Class[_] = classOf[SchemaRef]
   }
 
   case class Schema(
@@ -162,7 +162,7 @@ object OpenAPI {
       nullable: Option[Boolean] = None,
       `enum`: Option[Seq[String]] = None
   ) extends Union3[Schema, SchemaRef, OneOf] {
-    override def getElementClass = classOf[Schema]
+    override def getElementClass: Class[_] = classOf[Schema]
 
     def withDescription(description: Option[String]) = {
       this.copy(description = description)
@@ -174,7 +174,7 @@ object OpenAPI {
   case class ResponseRef(
       `$ref`: String
   ) extends Union2[Response, ResponseRef] {
-    def getElementClass = classOf[ResponseRef]
+    def getElementClass: Class[_] = classOf[ResponseRef]
   }
 
   case class Response(
@@ -183,7 +183,7 @@ object OpenAPI {
       // Status code string -> MediaType
       content: Map[String, MediaType] = Map.empty
   ) extends Union2[Response, ResponseRef] {
-    override def getElementClass = classOf[Response]
+    override def getElementClass: Class[_] = classOf[Response]
   }
 
   case class Header()

diff --git a/airframe-http-finagle/src/test/scala/wvlet/airframe/http/finagle/CustomCodecTest.scala b/airframe-http-finagle/src/test/scala/wvlet/airframe/http/finagle/CustomCodecTest.scala
@@ -63,7 +63,7 @@ object CustomCodecTest extends AirSpec {
         .withCustomCodec(Map(Surface.of[Suit] -> SuitCodec))
         .design
     ).add(Finagle.client.syncClientDesign)
-  ) { client: FinagleSyncClient =>
+  ) { (client: FinagleSyncClient) =>
     client.send(Request("/hello?suit=Spade")).contentString shouldBe "Spade"
     client.send(Request("/hello?suit=Heart")).contentString shouldBe "Heart"
   }

diff --git a/airframe-http-finagle/src/test/scala/wvlet/airframe/http/finagle/ErrorResponseTest.scala b/airframe-http-finagle/src/test/scala/wvlet/airframe/http/finagle/ErrorResponseTest.scala
@@ -34,7 +34,7 @@ object ErrorResponseTest extends AirSpec {
   test(
     "Return error response using JSON/MsgPack",
     design = _ + Finagle.server.withRouter(Router.of[MyApp]).design + Finagle.client.syncClientDesign
-  ) { client: FinagleSyncClient =>
+  ) { (client: FinagleSyncClient) =>
     warn(s"Running an error response test")
 
     test("json error response") {

diff --git a/airframe-http-finagle/src/test/scala/wvlet/airframe/http/finagle/FinagleDesignTest.scala b/airframe-http-finagle/src/test/scala/wvlet/airframe/http/finagle/FinagleDesignTest.scala
@@ -36,7 +36,7 @@ class FinagleDesignTest extends AirSpec {
   test("start server") {
     finagleDefaultDesign
       .bind[FinagleServerConfig].toInstance(newConfig)
-      .bind[FinagleSyncClient].toProvider { server: FinagleServer => Finagle.newSyncClient(server.localAddress) }
+      .bind[FinagleSyncClient].toProvider { (server: FinagleServer) => Finagle.newSyncClient(server.localAddress) }
       .noLifeCycleLogging
       .build[FinagleSyncClient] { client =>
         // The server will start here

diff --git a/airframe-http-finagle/src/test/scala/wvlet/airframe/http/finagle/FinagleRouterTest.scala b/airframe-http-finagle/src/test/scala/wvlet/airframe/http/finagle/FinagleRouterTest.scala
@@ -135,7 +135,9 @@ class FinagleRouterTest extends AirSpec {
     Finagle.server
       .withRouter(Router.add[MyApi])
       .design
-      .bind[FinagleClient].toProvider { server: FinagleServer => Finagle.client.noRetry.newClient(server.localAddress) }
+      .bind[FinagleClient].toProvider { (server: FinagleServer) =>
+        Finagle.client.noRetry.newClient(server.localAddress)
+      }
   }
 
   test("support Router.of[X] and Router.add[X]") {

diff --git a/airframe-http-finagle/src/test/scala/wvlet/airframe/http/finagle/HttpAccessLogTest.scala b/airframe-http-finagle/src/test/scala/wvlet/airframe/http/finagle/HttpAccessLogTest.scala
@@ -92,11 +92,11 @@ object HttpAccessLogTest extends AirSpec {
       .withRouter(router)
       .design
       .add(Finagle.client.noRetry.syncClientDesign)
-  ) { client: FinagleSyncClient =>
+  ) { (client: FinagleSyncClient) =>
     test("basic log entries") {
       val resp = client.get[String](
         "/user/1?session_id=xxx",
-        { r: Request =>
+        { (r: Request) =>
           // Add a custom header
           r.headerMap.put("X-App-Version", "1.0")
           r
@@ -210,7 +210,7 @@ object HttpAccessLogTest extends AirSpec {
   test(
     "JSON access log",
     design = _.bind[Resource[File]].toInstance(Resource.newTempFile("target/http_access_log_test.json"))
-  ) { file: Resource[File] =>
+  ) { (file: Resource[File]) =>
     test(
       "Write logs in JSON",
       design = _ + Finagle.server
@@ -221,7 +221,7 @@ object HttpAccessLogTest extends AirSpec {
           )
         )
         .designWithSyncClient
-    ) { client: FinagleSyncClient =>
+    ) { (client: FinagleSyncClient) =>
       val resp = client.get[String]("/user/2")
       resp shouldBe "hello user:2"
     }

diff --git a/...rame-http-finagle/src/test/scala/wvlet/airframe/http/finagle/ThreadLocalStorageTest.scala b/...rame-http-finagle/src/test/scala/wvlet/airframe/http/finagle/ThreadLocalStorageTest.scala
@@ -77,12 +77,12 @@ class ThreadLocalStorageTest extends AirSpec {
   override protected def design: Design = {
     val router = Router.add[TLSReaderFilter].andThen[MyApp]
     newFinagleServerDesign(name = "tls-test", router = router)
-      .bind[FinagleSyncClient].toProvider { server: FinagleServer =>
+      .bind[FinagleSyncClient].toProvider { (server: FinagleServer) =>
         Finagle.client.noRetry.newSyncClient(server.localAddress)
       }
   }
 
-  test("tls test") { client: FinagleSyncClient =>
+  test("tls test") { (client: FinagleSyncClient) =>
     test("read thread-local data set at the leaf filter") {
       val resp = client.get[String]("/get")
       resp shouldBe "hello tls"
@@ -104,7 +104,7 @@ class ThreadLocalStorageTest extends AirSpec {
     }
 
     test("Get request header from RPCContext") {
-      val resp = client.get[String]("/rpc-header", { req: Request => req.authorization = "Bearer xxxx"; req })
+      val resp = client.get[String]("/rpc-header", { (req: Request) => req.authorization = "Bearer xxxx"; req })
       resp shouldBe "Ok"
     }
   }

diff --git a/...e-http-finagle/src/test/scala/wvlet/airframe/http/finagle/filter/StandardFilterTest.scala b/...e-http-finagle/src/test/scala/wvlet/airframe/http/finagle/filter/StandardFilterTest.scala
@@ -51,17 +51,17 @@ object StandardFilterTest extends AirSpec {
 
   private val router = Router.add(MyFilter).andThen[MyAPI]
 
-  protected override def design =
-    Design.newDesign
-      .add(Finagle.server.withRouter(router).design)
+  initDesign {
+    _.add(Finagle.server.withRouter(router).design)
       .bind[SyncClient]
-      .toProvider { server: FinagleServer =>
+      .toProvider { (server: FinagleServer) =>
         Http.client
           .withRetryContext(_.noRetry)
           .newSyncClient(server.localAddress)
       }
+  }
 
-  test("use standard filter") { client: SyncClient =>
+  test("use standard filter") { (client: SyncClient) =>
     val resp = client.send(Http.request("/"))
     resp.contentString shouldBe "[Filtered] [xxxx] Hello myapp!"
   }

diff --git a/airframe-http-grpc/src/test/scala/wvlet/airframe/http/grpc/GrpcErrorLogTest.scala b/airframe-http-grpc/src/test/scala/wvlet/airframe/http/grpc/GrpcErrorLogTest.scala
@@ -44,16 +44,17 @@ object GrpcErrorLogTest extends AirSpec {
 
   private val router = RxRouter.of[DemoApiDebug]
 
-  protected override def design = {
-    gRPC.server
-      .withName("demo-api-debug")
-      .withRouter(router)
-      .withRequestLoggerProvider { (config: GrpcServerConfig) =>
-        GrpcRequestLogger
-          .newLogger(config.name, inMemoryLogWriter)
-      }
-      .designWithChannel
-      .bind[Router].toInstance(Router.of[DemoApiDebug])
+  initDesign { design =>
+    design +
+      gRPC.server
+        .withName("demo-api-debug")
+        .withRouter(router)
+        .withRequestLoggerProvider { (config: GrpcServerConfig) =>
+          GrpcRequestLogger
+            .newLogger(config.name, inMemoryLogWriter)
+        }
+        .designWithChannel
+        .bind[Router].toInstance(Router.of[DemoApiDebug])
   }
 
   private def captureAll(body: => Unit): Seq[Map[String, Any]] = {

diff --git a/airframe-http-grpc/src/test/scala/wvlet/airframe/http/grpc/GrpcTest.scala b/airframe-http-grpc/src/test/scala/wvlet/airframe/http/grpc/GrpcTest.scala
@@ -77,24 +77,26 @@ object GrpcTest extends AirSpec {
 
   private val port = IOUtil.randomPort
 
-  override protected def design =
-    Design.newDesign
-      .bind[Server].toInstance(
-        ServerBuilder.forPort(port).addService(service).build()
-      ).onStart { server =>
-        server.start()
-        info(s"Starting gRPC server localhost:${port}")
-      }
-      .onShutdown { server =>
-        info(s"Shutting down gRPC server localhost:${port}")
-        server.shutdownNow()
-      }
-      .bind[ManagedChannel].toProvider { (server: Server) =>
-        ManagedChannelBuilder.forTarget(s"localhost:${server.getPort}").usePlaintext().build()
-      }
-      .onShutdown { channel =>
-        channel.shutdownNow()
-      }
+  initDesign { design =>
+    design +
+      Design.newDesign
+        .bind[Server].toInstance(
+          ServerBuilder.forPort(port).addService(service).build()
+        ).onStart { server =>
+          server.start()
+          info(s"Starting gRPC server localhost:${port}")
+        }
+        .onShutdown { server =>
+          info(s"Shutting down gRPC server localhost:${port}")
+          server.shutdownNow()
+        }
+        .bind[ManagedChannel].toProvider { (server: Server) =>
+          ManagedChannelBuilder.forTarget(s"localhost:${server.getPort}").usePlaintext().build()
+        }
+        .onShutdown { channel =>
+          channel.shutdownNow()
+        }
+  }
 
   test("run server") { (server: Server, channel: ManagedChannel) =>
     val client = MyService.newBlockingStub(channel)

diff --git a/airframe-http-netty/src/test/scala/wvlet/airframe/http/netty/RPCClientBindingTest.scala b/airframe-http-netty/src/test/scala/wvlet/airframe/http/netty/RPCClientBindingTest.scala
@@ -76,12 +76,15 @@ object RPCClientBindingTest extends AirSpec {
     case class HelloResponse(msg: String)
   }
 
-  protected override def design =
-    Netty.server
-      .withRouter(RxRouter.of[MyApi]).design
-      .bind[MyRPCClient.RPCSyncClient].toProvider { (server: NettyServer) =>
-        MyRPCClient.newRPCSyncClient(Http.client.newSyncClient(server.localAddress))
-      }
+  initDesign(
+    _.add(
+      Netty.server
+        .withRouter(RxRouter.of[MyApi]).design
+        .bind[MyRPCClient.RPCSyncClient].toProvider { (server: NettyServer) =>
+          MyRPCClient.newRPCSyncClient(Http.client.newSyncClient(server.localAddress))
+        }
+    )
+  )
 
   test("Create a surface of an RPC client") {
     Surface.of[RPCSyncClient]