Scala Native 0.5 (#100)

* Scala Native 0.5

* bumps, fmt

Author: kubukoz

build.sbt

@@ -14,22 +14,22 @@ inThisBuild(
   )
 )
 
-val scala213 = "2.13.16"
+val scala213 = "2.13.18"
 val scala3 = "3.3.6"
 val jdkVersion = 11
 val allScalaVersions = List(scala213, scala3)
 val jvmScalaVersions = allScalaVersions
 val jsScalaVersions = allScalaVersions
 val nativeScalaVersions = allScalaVersions
 
-val fs2Version = "3.12.0"
+val fs2Version = "3.13.0"
 
 ThisBuild / versionScheme := Some("early-semver")
 ThisBuild / tpolecatOptionsMode := DevMode
 
 val commonSettings = Seq(
   libraryDependencies ++= Seq(
-    "com.disneystreaming" %%% "weaver-cats" % "0.8.4" % Test
+    "org.typelevel" %%% "weaver-cats" % "0.12.0" % Test
   ),
   mimaPreviousArtifacts := Set(
     // organization.value %%% name.value % "0.0.7"
@@ -68,7 +68,7 @@ val core = projectMatrix
     name := "jsonrpclib-core",
     commonSettings,
     libraryDependencies ++= Seq(
-      "com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-circe" % "2.30.2"
+      "com.github.plokhotnyuk.jsoniter-scala" %%% "jsoniter-scala-circe" % "2.38.9"
     )
   )
 
@@ -84,7 +84,7 @@ val fs2 = projectMatrix
     commonSettings,
     libraryDependencies ++= Seq(
       "co.fs2" %%% "fs2-core" % fs2Version,
-      "io.circe" %%% "circe-generic" % "0.14.7" % Test
+      "io.circe" %%% "circe-generic" % "0.14.15" % Test
     )
   )
 
@@ -108,7 +108,7 @@ val smithyTests = projectMatrix
   .settings(
     publish / skip := true,
     libraryDependencies ++= Seq(
-      "com.disneystreaming" %%% "weaver-cats" % "0.8.4" % Test
+      "org.typelevel" %%% "weaver-cats" % "0.12.0" % Test
     )
   )
   .disablePlugins(MimaPlugin)
@@ -159,7 +159,7 @@ val smithy4sTests = projectMatrix
     commonSettings,
     publish / skip := true,
     libraryDependencies ++= Seq(
-      "io.circe" %%% "circe-generic" % "0.14.7"
+      "io.circe" %%% "circe-generic" % "0.14.15"
     ),
     buildTimeProtocolDependency
   )
@@ -173,7 +173,7 @@ val exampleServer = projectMatrix
     publish / skip := true,
     libraryDependencies ++= Seq(
       "co.fs2" %%% "fs2-io" % fs2Version,
-      "io.circe" %%% "circe-generic" % "0.14.7"
+      "io.circe" %%% "circe-generic" % "0.14.15"
     )
   )
   .disablePlugins(MimaPlugin)
@@ -194,7 +194,7 @@ val exampleClient = projectMatrix
     publish / skip := true,
     libraryDependencies ++= Seq(
       "co.fs2" %%% "fs2-io" % fs2Version,
-      "io.circe" %%% "circe-generic" % "0.14.7"
+      "io.circe" %%% "circe-generic" % "0.14.15"
     )
   )
   .disablePlugins(MimaPlugin)

modules/core/src/test/scala/jsonrpclib/CallIdSpec.scala

@@ -15,9 +15,9 @@ object CallIdSpec extends FunSuite {
     val longJson = Long.MaxValue.toString
 
     val nullJson = "null"
-    assert.same(readFromString[Json](strJson).as[CallId], CallId.StringId("25").asRight) &&
-    assert.same(readFromString[Json](intJson).as[CallId], CallId.NumberId(25).asRight) &&
-    assert.same(readFromString[Json](longJson).as[CallId], CallId.NumberId(Long.MaxValue).asRight) &&
-    assert.same(readFromString[Json](nullJson).as[CallId], CallId.NullId.asRight)
+    expect.same(readFromString[Json](strJson).as[CallId], CallId.StringId("25").asRight) &&
+    expect.same(readFromString[Json](intJson).as[CallId], CallId.NumberId(25).asRight) &&
+    expect.same(readFromString[Json](longJson).as[CallId], CallId.NumberId(Long.MaxValue).asRight) &&
+    expect.same(readFromString[Json](nullJson).as[CallId], CallId.NullId.asRight)
   }
 }

modules/core/src/test/scala/jsonrpclib/RawMessageSpec.scala

@@ -21,40 +21,52 @@ object RawMessageSpec extends FunSuite {
     val invalidRawMessage =
       readFromString[Json](""" {"jsonrpc":"2.0","id":3} """.trim).as[RawMessage].fold(throw _, identity)
 
-    assert.same(
+    expect.same(
       rawMessage,
       RawMessage(jsonrpc = "2.0", result = Some(None), id = Some(NumberId(3)))
     ) &&
-    assert.same(rawMessage.toMessage, Right(ResponseMessage(NumberId(3), Payload.NullPayload))) &&
-    assert.same(
+    expect.same(rawMessage.toMessage, Right(ResponseMessage(NumberId(3), Payload.NullPayload))) &&
+    expect.same(
       invalidRawMessage,
       RawMessage(jsonrpc = "2.0", result = None, id = Some(NumberId(3)))
     ) &&
-    assert(invalidRawMessage.toMessage.isLeft, invalidRawMessage.toMessage.toString)
+    expect(invalidRawMessage.toMessage.isLeft, invalidRawMessage.toMessage.toString)
   }
 
   test("request message serialization") {
     val input: Message = InputMessage.RequestMessage("my/method", CallId.NumberId(1), None)
     val expected = """{"jsonrpc":"2.0","method":"my/method","id":1}"""
     val result = writeToString(input.asJson)
 
-    assert(result == expected, s"Expected: $expected, got: $result")
+    expect(result == expected, s"Expected: $expected, got: $result")
+  }
+
+  test("request message serialization with params") {
+    val input: Message = InputMessage.RequestMessage(
+      "greet",
+      CallId.NumberId(0),
+      Some(Payload(Json.obj("name" -> Json.fromString("Client"))))
+    )
+    val expected = """{"jsonrpc":"2.0","method":"greet","params":{"name":"Client"},"id":0}"""
+    val result = writeToString(input.asJson)
+
+    expect(result == expected, s"Expected: $expected, got: $result")
   }
 
   test("notification message serialization") {
     val input: Message = InputMessage.NotificationMessage("my/method", None)
     val expected = """{"jsonrpc":"2.0","method":"my/method"}"""
     val result = writeToString(input.asJson)
 
-    assert(result == expected, s"Expected: $expected, got: $result")
+    expect(result == expected, s"Expected: $expected, got: $result")
   }
 
   test("response message serialization") {
     val input: Message = OutputMessage.ResponseMessage(CallId.NumberId(1), Payload.NullPayload)
     val expected = """{"jsonrpc":"2.0","id":1,"result":null}"""
     val result = writeToString(input.asJson)
 
-    assert(result == expected, s"Expected: $expected, got: $result")
+    expect(result == expected, s"Expected: $expected, got: $result")
   }
 
   test("response message serialization with nested results") {
@@ -63,7 +75,7 @@ object RawMessageSpec extends FunSuite {
     val expected = """{"jsonrpc":"2.0","id":1,"result":{"result":1}}"""
     val result = writeToString(input.asJson)
 
-    assert(result == expected, s"Expected: $expected, got: $result")
+    expect(result == expected, s"Expected: $expected, got: $result")
   }
 
   test("error message serialization") {
@@ -74,7 +86,7 @@ object RawMessageSpec extends FunSuite {
     val expected = """{"jsonrpc":"2.0","error":{"code":-32603,"message":"Internal error","data":null},"id":1}"""
     val result = writeToString(input.asJson)
 
-    assert(result == expected, s"Expected: $expected, got: $result")
+    expect(result == expected, s"Expected: $expected, got: $result")
   }
 
 }

modules/core/src/test/scalajvm-native/jsonrpclib/internals/HeaderSpec.scala

@@ -18,7 +18,7 @@ object HeaderSpec extends FunSuite {
       "foo..."
     )
     val expected = Result(LSPHeaders(123, "application/vscode-jsonrpc", "utf-8"), "foo...")
-    assert.same(result, Right(expected))
+    expect.same(result, Right(expected))
   }
 
   test("headers (only content-)") {
@@ -28,15 +28,15 @@ object HeaderSpec extends FunSuite {
       "foo..."
     )
     val expected = Result(LSPHeaders(123, "application/json", "UTF-8"), "foo...")
-    assert.same(result, Right(expected))
+    expect.same(result, Right(expected))
   }
 
   test("no header)") {
     val result = read(
       "foo"
     )
     val expected = ProtocolError.ParseError("Could not parse LSP headers")
-    assert.same(result, Left(expected))
+    expect.same(result, Left(expected))
   }
 
   test("missing content-length") {
@@ -46,7 +46,7 @@ object HeaderSpec extends FunSuite {
       "foo..."
     )
     val expected = ProtocolError.ParseError("Missing Content-Length header")
-    assert.same(result, Left(expected))
+    expect.same(result, Left(expected))
   }
 
   case class Result(header: LSPHeaders, rest: String)

modules/smithy-tests/src/test/scala/jsonrpclib/JsonNotificationOutputValidatorSpec.scala

@@ -51,7 +51,7 @@ object JsonNotificationOutputValidatorSpec extends FunSuite {
       )
       .build()
 
-    assert(events.contains(expected))
+    expect(events.contains(expected))
   }
 
 }

modules/smithy-tests/src/test/scala/jsonrpclib/JsonPayloadValidatorSpec.scala

@@ -32,18 +32,18 @@ object JsonPayloadValidatorSpec extends FunSuite {
         |
         |structure OpInput {
         |  @jsonRpcPayload
-        |  data: String  
+        |  data: String
         |}
         |
         |structure OpOutput {
         |  @jsonRpcPayload
-        |  data: String  
+        |  data: String
         |}
         |
         |@error("client")
         |structure OpError {
         |  @jsonRpcPayload
-        |  data: String  
+        |  data: String
         |}
         |
         |""".stripMargin
@@ -72,12 +72,12 @@ object JsonPayloadValidatorSpec extends FunSuite {
         |}
         |
         |structure OpInput {
-        |  data: NestedStructure  
+        |  data: NestedStructure
         |}
         |
         |structure NestedStructure {
         |  @jsonRpcPayload
-        |  data: String  
+        |  data: String
         |}
         |""".stripMargin
       )
@@ -93,7 +93,7 @@ object JsonPayloadValidatorSpec extends FunSuite {
       )
       .build()
 
-    assert(events.contains(expected))
+    expect(events.contains(expected))
   }
 
 }

modules/smithy-tests/src/test/scala/jsonrpclib/JsonRpcOperationValidatorSpec.scala

@@ -67,6 +67,6 @@ object JsonRpcOperationValidatorSpec extends FunSuite {
         )
         .build()
 
-    assert(events.contains(expected))
+    expect(events.contains(expected))
   }
 }

modules/smithy-tests/src/test/scala/jsonrpclib/UniqueJsonRpcMethodNamesValidatorSpec.scala

@@ -67,7 +67,7 @@ object UniqueJsonRpcMethodNamesValidatorSpec extends FunSuite {
       )
       .build()
 
-    assert(events.contains(expected))
+    expect(events.contains(expected))
   }
 
   test("no error if two services use the same operation") {

project/Dependencies.scala

@@ -2,7 +2,7 @@ import sbt.*
 
 object Dependencies {
   val alloy = new {
-    val version = "0.3.20"
+    val version = "0.3.37"
     val core = "com.disneystreaming.alloy" % "alloy-core" % version
   }
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.11.3
+sbt.version=1.12.9