From 093821b48eff6076cc4123e8db5fcc6eb74f84d3 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@inpher.io>
Date: Wed, 9 Oct 2019 23:05:54 -0400
Subject: Upgrade to Scala 2.13

---
 shared/ApiProtocol.scala | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'shared')

diff --git a/shared/ApiProtocol.scala b/shared/ApiProtocol.scala
index 5d0e00a..eb6da0b 100644
--- a/shared/ApiProtocol.scala
+++ b/shared/ApiProtocol.scala
@@ -1,12 +1,24 @@
 package triad
 
 import java.time.Instant
-import spray.json.{DerivedJsonProtocol, JsNumber, JsValue, JsonFormat}
+import spray.json.{
+  DefaultJsonProtocol,
+  JsNumber,
+  JsValue,
+  JsonFormat,
+  RootJsonFormat
+}
 
-object ApiProtocol extends DerivedJsonProtocol {
+object ApiProtocol extends DefaultJsonProtocol {
   implicit val timestampFormat: JsonFormat[Instant] = new JsonFormat[Instant] {
     def read(js: JsValue) = Instant.ofEpochMilli(js.convertTo[Long])
     def write(i: Instant) = JsNumber(i.toEpochMilli)
   }
-  implicit val messageFormat = jsonFormat[Message]
+
+  implicit val messageFormat: RootJsonFormat[Message] = jsonFormat(
+    Message.apply _,
+    "content",
+    "author",
+    "timestamp"
+  )
 }
-- 
cgit v1.2.3