summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2019-09-16 10:33:09 +0800
committerLi Haoyi <haoyi.sg@gmail.com>2019-09-16 10:33:09 +0800
commit587f6c11d6feeb7d418165a1de652fe2ab410818 (patch)
treeed9027c928aada3f3a88fe6a8565a4c4c51eeb9b
parent8457fb35556377ad1605c25d6891e7e7ab01ca56 (diff)
downloadcask-587f6c11d6feeb7d418165a1de652fe2ab410818.tar.gz
cask-587f6c11d6feeb7d418165a1de652fe2ab410818.tar.bz2
cask-587f6c11d6feeb7d418165a1de652fe2ab410818.zip
0.2.60.2.6
-rw-r--r--cask/src/cask/main/Routes.scala1
-rw-r--r--docs/pages/1 - Cask: a Scala HTTP micro-framework.md4
-rw-r--r--example/websockets/app/src/Websockets.scala1
-rw-r--r--readme.md5
4 files changed, 8 insertions, 3 deletions
diff --git a/cask/src/cask/main/Routes.scala b/cask/src/cask/main/Routes.scala
index 512860a..98c5b78 100644
--- a/cask/src/cask/main/Routes.scala
+++ b/cask/src/cask/main/Routes.scala
@@ -7,6 +7,7 @@ import language.experimental.macros
trait Routes{
def decorators = Seq.empty[cask.router.RawDecorator]
+ implicit def executionContext = concurrent.ExecutionContext.Implicits.global
private[this] var metadata0: RoutesEndpointsMetadata[this.type] = null
def caskMetadata =
if (metadata0 != null) metadata0
diff --git a/docs/pages/1 - Cask: a Scala HTTP micro-framework.md b/docs/pages/1 - Cask: a Scala HTTP micro-framework.md
index 30cf2cd..920fe73 100644
--- a/docs/pages/1 - Cask: a Scala HTTP micro-framework.md
+++ b/docs/pages/1 - Cask: a Scala HTTP micro-framework.md
@@ -81,10 +81,10 @@ via the following coordinates:
```scala
// Mill
-ivy"com.lihaoyi::cask:0.2.5"
+ivy"com.lihaoyi::cask:0.2.6"
// SBT
-"com.lihaoyi" %% "cask" % "0.2.5"
+"com.lihaoyi" %% "cask" % "0.2.6"
```
The `./mill` command is just a wrapper around the
diff --git a/example/websockets/app/src/Websockets.scala b/example/websockets/app/src/Websockets.scala
index 6cada0f..fe32c5d 100644
--- a/example/websockets/app/src/Websockets.scala
+++ b/example/websockets/app/src/Websockets.scala
@@ -1,6 +1,5 @@
package app
-import concurrent.ExecutionContext.Implicits.global
object Websockets extends cask.MainRoutes{
@cask.websocket("/connect/:userName")
def showUserProfile(userName: String): cask.WebsocketResult = {
diff --git a/readme.md b/readme.md
index b3a9547..199919d 100644
--- a/readme.md
+++ b/readme.md
@@ -38,6 +38,11 @@ courtesy of EJ Technologies
## Changelog
+### 0.2.6
+
+- Embed `concurrent.ExecutionContext.global` in `cask.Routes` by default, to be
+ overriden if necessary
+
### 0.2.5
- Internal refactoring to clean up routing logic