From 84616903734f0f7a85dd519f557e5cf8eae5e90e Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Tue, 26 May 2020 10:44:07 +0800 Subject: [PATCH] fix compile --- build.sc | 2 +- cask/src/cask/endpoints/StaticEndpoints.scala | 2 +- cask/src/cask/router/Macros.scala | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sc b/build.sc index bdb6b55121..ddac7516b4 100644 --- a/build.sc +++ b/build.sc @@ -75,7 +75,7 @@ object cask extends CaskModule { object js extends UtilModule with ScalaJSModule{ def platformSegment = "js" - def scalaJSVersion = "0.6.29" + def scalaJSVersion = "0.6.33" def ivyDeps = super.ivyDeps() ++ Agg( ivy"com.lihaoyi::castor::0.1.1", ivy"org.scala-js::scalajs-dom::0.9.7" diff --git a/cask/src/cask/endpoints/StaticEndpoints.scala b/cask/src/cask/endpoints/StaticEndpoints.scala index c36551b996..3d9941c8ba 100644 --- a/cask/src/cask/endpoints/StaticEndpoints.scala +++ b/cask/src/cask/endpoints/StaticEndpoints.scala @@ -22,7 +22,7 @@ class staticFiles(val path: String, headers: Seq[(String, String)] = Nil) extend } class staticResources(val path: String, - resourceRoot: ClassLoader = getClass.getClassLoader, + resourceRoot: ClassLoader = classOf[staticResources].getClassLoader, headers: Seq[(String, String)] = Nil) extends HttpEndpoint[String, Seq[String]]{ val methods = Seq("get") diff --git a/cask/src/cask/router/Macros.scala b/cask/src/cask/router/Macros.scala index d0013329f1..e265b1a377 100644 --- a/cask/src/cask/router/Macros.scala +++ b/cask/src/cask/router/Macros.scala @@ -59,9 +59,9 @@ class Macros[C <: blackbox.Context](val c: C) { (remaining, docValues.headOption) } val (_, methodDoc) = getDocAnnotation(method.annotations) - val argValuesSymbol = q"${c.fresh[TermName]("argValues")}" - val argSigsSymbol = q"${c.fresh[TermName]("argSigs")}" - val ctxSymbol = q"${c.fresh[TermName]("ctx")}" + val argValuesSymbol = q"${c.fresh[TermName](TermName("argValues"))}" + val argSigsSymbol = q"${c.fresh[TermName](TermName("argSigs"))}" + val ctxSymbol = q"${c.fresh[TermName](TermName("ctx"))}" val argData = for(argListIndex <- method.paramLists.indices) yield{ val annotDeserializeType = annotDeserializeTypes.lift(argListIndex).getOrElse(tq"scala.Any") val argReader = argReaders.lift(argListIndex).getOrElse(q"cask.router.NoOpParser.instanceAny")