diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-12-04 21:09:40 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-04 21:09:40 +0800 |
commit | 438ef5a1e4ce39cbb60c686eecc4ec43abb757dc (patch) | |
tree | a336853f0bdc049325f167bdbea257d19ad0bb8d | |
parent | 9a728590ab5919c1c337175e0e27e0bc6f9a50f5 (diff) | |
parent | bcbc2f9a09cb9500b092bb9766bd1f74287cfd4f (diff) | |
download | cask-438ef5a1e4ce39cbb60c686eecc4ec43abb757dc.tar.gz cask-438ef5a1e4ce39cbb60c686eecc4ec43abb757dc.tar.bz2 cask-438ef5a1e4ce39cbb60c686eecc4ec43abb757dc.zip |
Merge pull request #10 from gavares/master0.2.0
Upgrade upickle -> 0.7.1
-rw-r--r-- | build.sc | 6 | ||||
-rw-r--r-- | cask/src/cask/endpoints/JsonEndpoint.scala | 9 |
2 files changed, 8 insertions, 7 deletions
@@ -27,7 +27,7 @@ object cask extends ScalaModule with PublishModule { def ivyDeps = Agg( ivy"org.scala-lang:scala-reflect:${scalaVersion()}", ivy"io.undertow:undertow-core:2.0.13.Final", - ivy"com.lihaoyi::upickle:0.6.6", + ivy"com.lihaoyi::upickle:0.7.1", ) def compileIvyDeps = Agg(ivy"com.lihaoyi::acyclic:0.1.7") def scalacOptions = Seq("-P:acyclic:force") @@ -50,10 +50,10 @@ object cask extends ScalaModule with PublishModule { def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", + ivy"com.lihaoyi::utest::0.6.6", ivy"com.lihaoyi::requests::0.1.5", ivy"org.xerial:sqlite-jdbc:3.18.0", - ivy"io.getquill::quill-jdbc:2.5.4" + ivy"io.getquill::quill-jdbc:2.6.0" ) } } diff --git a/cask/src/cask/endpoints/JsonEndpoint.scala b/cask/src/cask/endpoints/JsonEndpoint.scala index 8afd742..e0d1257 100644 --- a/cask/src/cask/endpoints/JsonEndpoint.scala +++ b/cask/src/cask/endpoints/JsonEndpoint.scala @@ -7,20 +7,21 @@ import cask.main.Endpoint import cask.model.{Request, Response} -sealed trait JsReader[T] extends Router.ArgReader[ujson.Js.Value, T, cask.model.Request] +sealed trait JsReader[T] extends Router.ArgReader[ujson.Value, T, cask.model.Request] object JsReader{ implicit def defaultJsReader[T: upickle.default.Reader] = new JsReader[T]{ def arity = 1 - def read(ctx: cask.model.Request, label: String, input: ujson.Js.Value): T = { - implicitly[upickle.default.Reader[T]].apply(input) + def read(ctx: cask.model.Request, label: String, input: ujson.Value): T = { + val reader = implicitly[upickle.default.Reader[T]] + upickle.default.read[T](input)(reader) } } implicit def paramReader[T: ParamReader] = new JsReader[T] { override def arity = 0 - override def read(ctx: cask.model.Request, label: String, v: ujson.Js.Value) = { + override def read(ctx: cask.model.Request, label: String, v: ujson.Value) = { implicitly[ParamReader[T]].read(ctx, label, Nil) } } |