summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2019-10-10 16:43:10 +0800
committerLi Haoyi <haoyi.sg@gmail.com>2019-10-10 16:43:10 +0800
commitf257646827dcb26ed9c3c2ce5e0dd1f9c61b7fa5 (patch)
tree083e73b1a398010a15a2fc11e48132d3f4494741
parentdbb715c7abf6881da3a602b1659a00c4d7d48af1 (diff)
downloadcask-f257646827dcb26ed9c3c2ce5e0dd1f9c61b7fa5.tar.gz
cask-f257646827dcb26ed9c3c2ce5e0dd1f9c61b7fa5.tar.bz2
cask-f257646827dcb26ed9c3c2ce5e0dd1f9c61b7fa5.zip
bump Scala to 2.13.1
-rw-r--r--build.sc2
-rw-r--r--cask/src/cask/router/Decorators.scala2
-rwxr-xr-xmill2
3 files changed, 3 insertions, 3 deletions
diff --git a/build.sc b/build.sc
index 7da6002..47ac6bc 100644
--- a/build.sc
+++ b/build.sc
@@ -27,7 +27,7 @@ import $file.example.websockets3.build
import $file.example.websockets4.build
trait CaskModule extends ScalaModule with PublishModule{
- def scalaVersion = "2.13.0"
+ def scalaVersion = "2.13.1"
def publishVersion = build.publishVersion()._2
diff --git a/cask/src/cask/router/Decorators.scala b/cask/src/cask/router/Decorators.scala
index 895be53..9ae737b 100644
--- a/cask/src/cask/router/Decorators.scala
+++ b/cask/src/cask/router/Decorators.scala
@@ -14,7 +14,7 @@ import cask.model.{Request, Response}
* to `wrapFunction`, which takes a `Map` representing any additional argument
* lists (if any).
*/
-trait Decorator[OuterReturned, InnerReturned, Input]{
+trait Decorator[OuterReturned, InnerReturned, Input] extends scala.annotation.Annotation {
final type InputTypeAlias = Input
type InputParser[T] <: ArgReader[Input, T, Request]
final type Delegate = Map[String, Input] => Result[InnerReturned]
diff --git a/mill b/mill
index e969003..b4aed4f 100755
--- a/mill
+++ b/mill
@@ -3,7 +3,7 @@
# This is a wrapper script, that automatically download mill from GitHub release pages
# You can give the required mill version with MILL_VERSION env variable
# If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
-DEFAULT_MILL_VERSION=0.5.0
+DEFAULT_MILL_VERSION=0.5.1
set -e