summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2019-06-30 07:50:09 -0700
committerLi Haoyi <haoyi.sg@gmail.com>2019-06-30 08:22:05 -0700
commit20d3e6a54b172570ef7bbe174a31f7530e73cabf (patch)
treee5069474e5a2ef976a259ee66f8de88ee2509f15
parente7449191b9934d0b91ab9629bb4c8239e04ef497 (diff)
downloadcask-20d3e6a54b172570ef7bbe174a31f7530e73cabf.tar.gz
cask-20d3e6a54b172570ef7bbe174a31f7530e73cabf.tar.bz2
cask-20d3e6a54b172570ef7bbe174a31f7530e73cabf.zip
tweak example generation
Diffstat
-rw-r--r--build.sc8
-rw-r--r--example/compress/build.sc2
-rw-r--r--example/compress2/build.sc3
-rw-r--r--example/compress3/build.sc3
-rw-r--r--example/cookies/build.sc3
-rw-r--r--example/decorated/build.sc3
-rw-r--r--example/decorated2/build.sc3
-rw-r--r--example/endpoints/build.sc3
-rw-r--r--example/formJsonPost/build.sc3
-rw-r--r--example/httpMethods/build.sc3
-rw-r--r--example/minimalApplication/build.sc3
-rw-r--r--example/minimalApplication2/build.sc3
-rw-r--r--example/redirectAbort/build.sc3
-rw-r--r--example/scalatags/build.sc3
-rw-r--r--example/staticFiles/build.sc3
-rw-r--r--example/todo/build.sc3
-rw-r--r--example/todoApi/build.sc3
-rw-r--r--example/todoDb/build.sc3
-rw-r--r--example/twirl/build.sc3
-rw-r--r--example/variableRoutes/build.sc3
-rw-r--r--example/websockets/build.sc3
21 files changed, 39 insertions, 28 deletions
diff --git a/build.sc b/build.sc
index b47f25a..e767276 100644
--- a/build.sc
+++ b/build.sc
@@ -59,8 +59,6 @@ object cask extends ScalaModule with PublishModule {
}
object example extends Module{
trait LocalModule extends ScalaModule{
- def ivyDeps = super.ivyDeps().filter(_ != ivy"com.lihaoyi::cask:0.2.1")
-
override def millSourcePath = super.millSourcePath / "app"
def moduleDeps = Seq(cask)
}
@@ -140,9 +138,9 @@ def uploadToGithub(authKey: String) = T.command{
f / last / "build.sc",
os.read(f / last / "build.sc")
.replace("trait AppModule ", "object app ")
- .replace(
- "object test",
- "def ivyDeps = Agg(ivy\"com.lihaoyi::cask:" + releaseTag + "\")\n object test"
+ .replaceFirst(
+ "def ivyDeps = Agg\\[Dep\\]\\(",
+ "def ivyDeps = Agg(\n ivy\"com.lihaoyi::cask:" + releaseTag + "\""
)
)
diff --git a/example/compress/build.sc b/example/compress/build.sc
index e6167a8..ac96e15 100644
--- a/example/compress/build.sc
+++ b/example/compress/build.sc
@@ -4,6 +4,8 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
+ def ivyDeps = Agg[Dep](
+ )
object test extends Tests{
def testFrameworks = Seq("utest.runner.Framework")
diff --git a/example/compress2/build.sc b/example/compress2/build.sc
index e6167a8..c0e75a7 100644
--- a/example/compress2/build.sc
+++ b/example/compress2/build.sc
@@ -3,7 +3,8 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
-
+ def ivyDeps = Agg[Dep](
+ )
object test extends Tests{
def testFrameworks = Seq("utest.runner.Framework")
diff --git a/example/compress3/build.sc b/example/compress3/build.sc
index e6167a8..c0e75a7 100644
--- a/example/compress3/build.sc
+++ b/example/compress3/build.sc
@@ -3,7 +3,8 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
-
+ def ivyDeps = Agg[Dep](
+ )
object test extends Tests{
def testFrameworks = Seq("utest.runner.Framework")
diff --git a/example/cookies/build.sc b/example/cookies/build.sc
index e6167a8..c0e75a7 100644
--- a/example/cookies/build.sc
+++ b/example/cookies/build.sc
@@ -3,7 +3,8 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
-
+ def ivyDeps = Agg[Dep](
+ )
object test extends Tests{
def testFrameworks = Seq("utest.runner.Framework")
diff --git a/example/decorated/build.sc b/example/decorated/build.sc
index e6167a8..c0e75a7 100644
--- a/example/decorated/build.sc
+++ b/example/decorated/build.sc
@@ -3,7 +3,8 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
-
+ def ivyDeps = Agg[Dep](
+ )
object test extends Tests{
def testFrameworks = Seq("utest.runner.Framework")
diff --git a/example/decorated2/build.sc b/example/decorated2/build.sc
index e6167a8..c0e75a7 100644
--- a/example/decorated2/build.sc
+++ b/example/decorated2/build.sc
@@ -3,7 +3,8 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
-
+ def ivyDeps = Agg[Dep](
+ )
object test extends Tests{
def testFrameworks = Seq("utest.runner.Framework")
diff --git a/example/endpoints/build.sc b/example/endpoints/build.sc
index e6167a8..c0e75a7 100644
--- a/example/endpoints/build.sc
+++ b/example/endpoints/build.sc
@@ -3,7 +3,8 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
-
+ def ivyDeps = Agg[Dep](
+ )
object test extends Tests{
def testFrameworks = Seq("utest.runner.Framework")
diff --git a/example/formJsonPost/build.sc b/example/formJsonPost/build.sc
index e6167a8..c0e75a7 100644
--- a/example/formJsonPost/build.sc
+++ b/example/formJsonPost/build.sc
@@ -3,7 +3,8 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
-
+ def ivyDeps = Agg[Dep](
+ )
object test extends Tests{
def testFrameworks = Seq("utest.runner.Framework")
diff --git a/example/httpMethods/build.sc b/example/httpMethods/build.sc
index e6167a8..c0e75a7 100644
--- a/example/httpMethods/build.sc
+++ b/example/httpMethods/build.sc
@@ -3,7 +3,8 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
-
+ def ivyDeps = Agg[Dep](
+ )
object test extends Tests{
def testFrameworks = Seq("utest.runner.Framework")
diff --git a/example/minimalApplication/build.sc b/example/minimalApplication/build.sc
index e6167a8..c0e75a7 100644
--- a/example/minimalApplication/build.sc
+++ b/example/minimalApplication/build.sc
@@ -3,7 +3,8 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
-
+ def ivyDeps = Agg[Dep](
+ )
object test extends Tests{
def testFrameworks = Seq("utest.runner.Framework")
diff --git a/example/minimalApplication2/build.sc b/example/minimalApplication2/build.sc
index e6167a8..c0e75a7 100644
--- a/example/minimalApplication2/build.sc
+++ b/example/minimalApplication2/build.sc
@@ -3,7 +3,8 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
-
+ def ivyDeps = Agg[Dep](
+ )
object test extends Tests{
def testFrameworks = Seq("utest.runner.Framework")
diff --git a/example/redirectAbort/build.sc b/example/redirectAbort/build.sc
index e6167a8..c0e75a7 100644
--- a/example/redirectAbort/build.sc
+++ b/example/redirectAbort/build.sc
@@ -3,7 +3,8 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
-
+ def ivyDeps = Agg[Dep](
+ )
object test extends Tests{
def testFrameworks = Seq("utest.runner.Framework")
diff --git a/example/scalatags/build.sc b/example/scalatags/build.sc
index 23fea76..3971d88 100644
--- a/example/scalatags/build.sc
+++ b/example/scalatags/build.sc
@@ -3,8 +3,7 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
- def ivyDeps = Agg(
- ivy"com.lihaoyi::cask:0.2.1",
+ def ivyDeps = Agg[Dep](
ivy"com.lihaoyi::scalatags:0.7.0",
)
diff --git a/example/staticFiles/build.sc b/example/staticFiles/build.sc
index 6f84dac..d45045d 100644
--- a/example/staticFiles/build.sc
+++ b/example/staticFiles/build.sc
@@ -5,7 +5,8 @@ trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
def forkWorkingDir = build.millSourcePath
-
+ def ivyDeps = Agg[Dep](
+ )
object test extends Tests{
def testFrameworks = Seq("utest.runner.Framework")
diff --git a/example/todo/build.sc b/example/todo/build.sc
index 2491af7..beeb947 100644
--- a/example/todo/build.sc
+++ b/example/todo/build.sc
@@ -3,8 +3,7 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
- def ivyDeps = Agg(
- ivy"com.lihaoyi::cask:0.2.1",
+ def ivyDeps = Agg[Dep](
ivy"org.xerial:sqlite-jdbc:3.18.0",
ivy"io.getquill::quill-jdbc:2.5.4",
ivy"com.lihaoyi::scalatags:0.7.0",
diff --git a/example/todoApi/build.sc b/example/todoApi/build.sc
index e6167a8..c0e75a7 100644
--- a/example/todoApi/build.sc
+++ b/example/todoApi/build.sc
@@ -3,7 +3,8 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
-
+ def ivyDeps = Agg[Dep](
+ )
object test extends Tests{
def testFrameworks = Seq("utest.runner.Framework")
diff --git a/example/todoDb/build.sc b/example/todoDb/build.sc
index f9b3692..e2afdfc 100644
--- a/example/todoDb/build.sc
+++ b/example/todoDb/build.sc
@@ -3,8 +3,7 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
- def ivyDeps = Agg(
- ivy"com.lihaoyi::cask:0.2.1",
+ def ivyDeps = Agg[Dep](
ivy"org.xerial:sqlite-jdbc:3.18.0",
ivy"io.getquill::quill-jdbc:2.5.4"
)
diff --git a/example/twirl/build.sc b/example/twirl/build.sc
index f88bfc6..6a59f0d 100644
--- a/example/twirl/build.sc
+++ b/example/twirl/build.sc
@@ -6,8 +6,7 @@ trait AppModule extends ScalaModule with mill.twirllib.TwirlModule{
def twirlVersion = "1.5.0-M1"
def generatedSources = T{ Seq(compileTwirl().classes) }
- def ivyDeps = Agg(
- ivy"com.lihaoyi::cask:0.2.1",
+ def ivyDeps = Agg[Dep](
ivy"com.lihaoyi::scalatags:0.7.0",
ivy"com.typesafe.play::twirl-api:${twirlVersion()}",
)
diff --git a/example/variableRoutes/build.sc b/example/variableRoutes/build.sc
index e6167a8..c0e75a7 100644
--- a/example/variableRoutes/build.sc
+++ b/example/variableRoutes/build.sc
@@ -3,7 +3,8 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
-
+ def ivyDeps = Agg[Dep](
+ )
object test extends Tests{
def testFrameworks = Seq("utest.runner.Framework")
diff --git a/example/websockets/build.sc b/example/websockets/build.sc
index e36e1b7..c788216 100644
--- a/example/websockets/build.sc
+++ b/example/websockets/build.sc
@@ -3,7 +3,8 @@ import mill._, scalalib._
trait AppModule extends ScalaModule{
def scalaVersion = "2.13.0"
-
+ def ivyDeps = Agg[Dep](
+ )
object test extends Tests{
def testFrameworks = Seq("utest.runner.Framework")
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-06 04:24:13 +0000