Skip to content

Commit

Permalink
fix compile
Browse files Browse the repository at this point in the history
  • Loading branch information
lihaoyi committed May 26, 2020
1 parent ad015ae commit 8461690
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cask/src/cask/endpoints/StaticEndpoints.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions cask/src/cask/router/Macros.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 8461690

Please sign in to comment.