From 721944aad4cea04173e6cead589ab50d2cf94e7c Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Tue, 21 Jul 2020 14:45:25 +0800
Subject: [PATCH] 0.7.2

---
 cask/src/cask/main/Routes.scala                               | 2 --
 example/compress2/app/src/Compress2.scala                     | 4 ++--
 example/compress3/app/src/Compress3.scala                     | 4 ++--
 example/minimalApplication2/app/src/MinimalApplication2.scala | 4 ++--
 example/websockets3/app/src/Websockets3.scala                 | 4 ++--
 example/websockets4/app/src/Websockets4.scala                 | 4 ++--
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/cask/src/cask/main/Routes.scala b/cask/src/cask/main/Routes.scala
index 93200860d5..c31499657a 100644
--- a/cask/src/cask/main/Routes.scala
+++ b/cask/src/cask/main/Routes.scala
@@ -7,7 +7,6 @@ import language.experimental.macros
 trait Routes{
 
   def decorators = Seq.empty[cask.router.Decorator[_, _, _]]
-  implicit def actorContext: castor.Context
   private[this] var metadata0: RoutesEndpointsMetadata[this.type] = null
   def caskMetadata =
     if (metadata0 != null) metadata0
@@ -17,5 +16,4 @@ trait Routes{
     metadata0 = routes
   }
 
-  implicit def log: cask.util.Logger
 }
diff --git a/example/compress2/app/src/Compress2.scala b/example/compress2/app/src/Compress2.scala
index 4bb84b6953..1c3986f356 100644
--- a/example/compress2/app/src/Compress2.scala
+++ b/example/compress2/app/src/Compress2.scala
@@ -1,7 +1,7 @@
 package app
 
-case class Compress2()(implicit val actorContext: castor.Context,
-                       val log: cask.Logger) extends cask.Routes{
+case class Compress2()(implicit cc: castor.Context,
+                       log: cask.Logger) extends cask.Routes{
   override def decorators = Seq(new cask.decorators.compress())
 
   @cask.get("/")
diff --git a/example/compress3/app/src/Compress3.scala b/example/compress3/app/src/Compress3.scala
index 466e52ef27..42ece37b0b 100644
--- a/example/compress3/app/src/Compress3.scala
+++ b/example/compress3/app/src/Compress3.scala
@@ -1,7 +1,7 @@
 package app
 
-case class Compress3()(implicit val actorContext: castor.Context,
-                       val log: cask.Logger) extends cask.Routes{
+case class Compress3()(implicit cc: castor.Context,
+                       log: cask.Logger) extends cask.Routes{
 
   @cask.get("/")
   def hello() = {
diff --git a/example/minimalApplication2/app/src/MinimalApplication2.scala b/example/minimalApplication2/app/src/MinimalApplication2.scala
index 52468d7d70..a131448b60 100644
--- a/example/minimalApplication2/app/src/MinimalApplication2.scala
+++ b/example/minimalApplication2/app/src/MinimalApplication2.scala
@@ -1,7 +1,7 @@
 package app
 
-case class MinimalRoutes()(implicit val actorContext: castor.Context,
-                           val log: cask.Logger) extends cask.Routes{
+case class MinimalRoutes()(implicit cc: castor.Context,
+                           log: cask.Logger) extends cask.Routes{
   @cask.get("/")
   def hello() = {
     "Hello World!"
diff --git a/example/websockets3/app/src/Websockets3.scala b/example/websockets3/app/src/Websockets3.scala
index 07349e8698..9f11e4f050 100644
--- a/example/websockets3/app/src/Websockets3.scala
+++ b/example/websockets3/app/src/Websockets3.scala
@@ -1,7 +1,7 @@
 package app
 
-case class Websockets3()(implicit val actorContext: castor.Context,
-                         val log: cask.Logger) extends cask.Routes{
+case class Websockets3()(implicit cc: castor.Context,
+                         log: cask.Logger) extends cask.Routes{
   @cask.websocket("/connect/:userName")
   def showUserProfile(userName: String): cask.WebsocketResult = {
     if (userName != "haoyi") cask.Response("", statusCode = 403)
diff --git a/example/websockets4/app/src/Websockets4.scala b/example/websockets4/app/src/Websockets4.scala
index 6707df1fda..2e17034f2b 100644
--- a/example/websockets4/app/src/Websockets4.scala
+++ b/example/websockets4/app/src/Websockets4.scala
@@ -1,7 +1,7 @@
 package app
 
-case class Websockets4()(implicit val actorContext: castor.Context,
-                         val log: cask.Logger) extends cask.Routes{
+case class Websockets4()(implicit cc: castor.Context,
+                         log: cask.Logger) extends cask.Routes{
   // make sure compress decorator passes non-requests through correctly
   override def decorators = Seq(new cask.decorators.compress())
   @cask.websocket("/connect/:userName")