From 5cf14a43a9e92a8e6868ec42458bb12806847a8e Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 13 Aug 2018 17:42:10 +0800 Subject: 0.0.7 --- build.sc | 17 +++++++++-------- docs/build.sc | 2 +- example/compress/build.sc | 2 +- example/compress2/build.sc | 2 +- example/compress3/build.sc | 2 +- example/cookies/build.sc | 2 +- example/decorated/build.sc | 2 +- example/decorated2/build.sc | 2 +- example/endpoints/build.sc | 2 +- example/formJsonPost/build.sc | 2 +- example/httpMethods/build.sc | 2 +- example/minimalApplication/build.sc | 2 +- example/minimalApplication2/build.sc | 2 +- example/redirectAbort/build.sc | 2 +- example/scalatags/build.sc | 2 +- example/staticFiles/build.sc | 2 +- example/todo/build.sc | 2 +- example/todoApi/build.sc | 2 +- example/todoDb/build.sc | 2 +- example/variableRoutes/build.sc | 2 +- example/websockets/build.sc | 2 +- 21 files changed, 29 insertions(+), 28 deletions(-) diff --git a/build.sc b/build.sc index f82bbe3..05df44a 100644 --- a/build.sc +++ b/build.sc @@ -58,7 +58,7 @@ object cask extends ScalaModule with PublishModule { } object example extends Module{ trait LocalModule extends ScalaModule{ - def ivyDeps = super.ivyDeps().filter(_ != ivy"com.lihaoyi::cask:0.0.6") + def ivyDeps = super.ivyDeps().filter(_ != ivy"com.lihaoyi::cask:0.0.7") override def millSourcePath = super.millSourcePath / "app" def moduleDeps = Seq(cask) @@ -127,9 +127,10 @@ def uploadToGithub(authKey: String) = T.command{ ) for(example <- examples){ val f = tmp.dir() - cp(example, f/'folder) + val last = example.last + "-" + label + cp(example, f/last) write.over( - f/'folder/"cask", + f/last/"cask", """#!/usr/bin/env bash | |if [ ! -f out/mill-cask ]; then @@ -142,14 +143,14 @@ def uploadToGithub(authKey: String) = T.command{ |"$(pwd)"/out/mill-cask "$@" """.stripMargin ) - %%("chmod", "+x", f/'folder/"cask")(f/'folder) + %%("chmod", "+x", f/last/"cask")(f/last) write.over( - f/'folder/"build.sc", - read(f/'folder/"build.sc").replace("trait AppModule ", "object app ") + f/last/"build.sc", + read(f/last/"build.sc").replace("trait AppModule ", "object app ") ) - %%("zip", "-r", f/"out.zip", f/'folder)(f/'folder) - upload.apply(f/"out.zip", releaseTag, label + "/" + example.last + ".zip", authKey) + %%("zip", "-r", f/"out.zip", f/'last)(f) + upload.apply(f/"out.zip", releaseTag, last + ".zip", authKey) } } diff --git a/docs/build.sc b/docs/build.sc index 3da450f..4d2beda 100644 --- a/docs/build.sc +++ b/docs/build.sc @@ -40,7 +40,7 @@ val posts = { val g = m.group(1) val txt = read(ls(pwd/up/'example/g/'app/'src).head).replace("$", "\\$") val downloadLink = - s"https://github.com/lihaoyi/cask/releases/download/$releaseTag/$releaseTag.$g.zip" + s"https://github.com/lihaoyi/cask/releases/download/$releaseTag/$g-$releaseTag.zip" s""" |```scala diff --git a/example/compress/build.sc b/example/compress/build.sc index 1d4f2bb..fc11749 100644 --- a/example/compress/build.sc +++ b/example/compress/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ) object test extends Tests{ diff --git a/example/compress2/build.sc b/example/compress2/build.sc index 1d4f2bb..fc11749 100644 --- a/example/compress2/build.sc +++ b/example/compress2/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ) object test extends Tests{ diff --git a/example/compress3/build.sc b/example/compress3/build.sc index 1d4f2bb..fc11749 100644 --- a/example/compress3/build.sc +++ b/example/compress3/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ) object test extends Tests{ diff --git a/example/cookies/build.sc b/example/cookies/build.sc index 1d4f2bb..fc11749 100644 --- a/example/cookies/build.sc +++ b/example/cookies/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ) object test extends Tests{ diff --git a/example/decorated/build.sc b/example/decorated/build.sc index 1d4f2bb..fc11749 100644 --- a/example/decorated/build.sc +++ b/example/decorated/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ) object test extends Tests{ diff --git a/example/decorated2/build.sc b/example/decorated2/build.sc index 1d4f2bb..fc11749 100644 --- a/example/decorated2/build.sc +++ b/example/decorated2/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ) object test extends Tests{ diff --git a/example/endpoints/build.sc b/example/endpoints/build.sc index 1d4f2bb..fc11749 100644 --- a/example/endpoints/build.sc +++ b/example/endpoints/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ) object test extends Tests{ diff --git a/example/formJsonPost/build.sc b/example/formJsonPost/build.sc index 1d4f2bb..fc11749 100644 --- a/example/formJsonPost/build.sc +++ b/example/formJsonPost/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ) object test extends Tests{ diff --git a/example/httpMethods/build.sc b/example/httpMethods/build.sc index 1d4f2bb..fc11749 100644 --- a/example/httpMethods/build.sc +++ b/example/httpMethods/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ) object test extends Tests{ diff --git a/example/minimalApplication/build.sc b/example/minimalApplication/build.sc index 1d4f2bb..fc11749 100644 --- a/example/minimalApplication/build.sc +++ b/example/minimalApplication/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ) object test extends Tests{ diff --git a/example/minimalApplication2/build.sc b/example/minimalApplication2/build.sc index 1d4f2bb..fc11749 100644 --- a/example/minimalApplication2/build.sc +++ b/example/minimalApplication2/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ) object test extends Tests{ diff --git a/example/redirectAbort/build.sc b/example/redirectAbort/build.sc index 1d4f2bb..fc11749 100644 --- a/example/redirectAbort/build.sc +++ b/example/redirectAbort/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ) object test extends Tests{ diff --git a/example/scalatags/build.sc b/example/scalatags/build.sc index 2a10807..5c3ddcd 100644 --- a/example/scalatags/build.sc +++ b/example/scalatags/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ivy"com.lihaoyi::scalatags:0.6.7", ) diff --git a/example/staticFiles/build.sc b/example/staticFiles/build.sc index 1d4f2bb..fc11749 100644 --- a/example/staticFiles/build.sc +++ b/example/staticFiles/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ) object test extends Tests{ diff --git a/example/todo/build.sc b/example/todo/build.sc index b57f75c..779e065 100644 --- a/example/todo/build.sc +++ b/example/todo/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ivy"org.xerial:sqlite-jdbc:3.18.0", ivy"io.getquill::quill-jdbc:2.5.4", ivy"com.lihaoyi::scalatags:0.6.7", diff --git a/example/todoApi/build.sc b/example/todoApi/build.sc index 1d4f2bb..fc11749 100644 --- a/example/todoApi/build.sc +++ b/example/todoApi/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ) object test extends Tests{ diff --git a/example/todoDb/build.sc b/example/todoDb/build.sc index e6cf583..434f621 100644 --- a/example/todoDb/build.sc +++ b/example/todoDb/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ivy"org.xerial:sqlite-jdbc:3.18.0", ivy"io.getquill::quill-jdbc:2.5.4" ) diff --git a/example/variableRoutes/build.sc b/example/variableRoutes/build.sc index 1d4f2bb..fc11749 100644 --- a/example/variableRoutes/build.sc +++ b/example/variableRoutes/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ) object test extends Tests{ diff --git a/example/websockets/build.sc b/example/websockets/build.sc index a612c66..fdd003c 100644 --- a/example/websockets/build.sc +++ b/example/websockets/build.sc @@ -4,7 +4,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ def scalaVersion = "2.12.6" def ivyDeps = Agg( - ivy"com.lihaoyi::cask:0.0.6", + ivy"com.lihaoyi::cask:0.0.7", ) object test extends Tests{ -- cgit v1.2.3