From 29fc3b6c8f74ece3b6e6cf354f0e342bbf8511ac Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sat, 15 Jun 2019 08:40:34 +0200 Subject: 0.2.1: support for Scala 2.13.0. Some tests using Quill disabled until they get on 2.13 as well Small typos There were pair of really inconsequential typos in the documentation. . --- example/compress/build.sc | 6 +++--- example/compress2/build.sc | 6 +++--- example/compress3/build.sc | 6 +++--- example/cookies/build.sc | 6 +++--- example/decorated/build.sc | 6 +++--- example/decorated2/build.sc | 6 +++--- example/endpoints/build.sc | 6 +++--- example/formJsonPost/app/test/src/ExampleTests.scala | 2 +- example/formJsonPost/build.sc | 6 +++--- example/httpMethods/build.sc | 6 +++--- example/minimalApplication/build.sc | 6 +++--- example/minimalApplication2/build.sc | 6 +++--- example/redirectAbort/build.sc | 6 +++--- example/scalatags/build.sc | 8 ++++---- example/staticFiles/build.sc | 6 +++--- example/todo/build.sc | 8 ++++---- example/todoApi/build.sc | 6 +++--- example/todoDb/build.sc | 6 +++--- example/twirl/build.sc | 12 ++++++------ example/variableRoutes/app/test/src/ExampleTests.scala | 2 +- example/variableRoutes/build.sc | 6 +++--- example/websockets/build.sc | 6 +++--- 22 files changed, 67 insertions(+), 67 deletions(-) (limited to 'example') diff --git a/example/compress/build.sc b/example/compress/build.sc index 2816643..699b94f 100644 --- a/example/compress/build.sc +++ b/example/compress/build.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ) @@ -11,8 +11,8 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/compress2/build.sc b/example/compress2/build.sc index 2816643..699b94f 100644 --- a/example/compress2/build.sc +++ b/example/compress2/build.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ) @@ -11,8 +11,8 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/compress3/build.sc b/example/compress3/build.sc index 2816643..699b94f 100644 --- a/example/compress3/build.sc +++ b/example/compress3/build.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ) @@ -11,8 +11,8 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/cookies/build.sc b/example/cookies/build.sc index 2816643..699b94f 100644 --- a/example/cookies/build.sc +++ b/example/cookies/build.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ) @@ -11,8 +11,8 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/decorated/build.sc b/example/decorated/build.sc index 2816643..699b94f 100644 --- a/example/decorated/build.sc +++ b/example/decorated/build.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ) @@ -11,8 +11,8 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/decorated2/build.sc b/example/decorated2/build.sc index 2816643..699b94f 100644 --- a/example/decorated2/build.sc +++ b/example/decorated2/build.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ) @@ -11,8 +11,8 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/endpoints/build.sc b/example/endpoints/build.sc index 2816643..699b94f 100644 --- a/example/endpoints/build.sc +++ b/example/endpoints/build.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ) @@ -11,8 +11,8 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/formJsonPost/app/test/src/ExampleTests.scala b/example/formJsonPost/app/test/src/ExampleTests.scala index 137a978..148ebfd 100644 --- a/example/formJsonPost/app/test/src/ExampleTests.scala +++ b/example/formJsonPost/app/test/src/ExampleTests.scala @@ -19,7 +19,7 @@ object ExampleTests extends TestSuite{ val tests = Tests{ 'FormJsonPost - test(FormJsonPost){ host => requests.post(s"$host/json", data = """{"value1": true, "value2": [3]}""").text() ==> - "OK true Vector(3)" + "OK true List(3)" requests.post( s"$host/form", diff --git a/example/formJsonPost/build.sc b/example/formJsonPost/build.sc index 2816643..699b94f 100644 --- a/example/formJsonPost/build.sc +++ b/example/formJsonPost/build.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ) @@ -11,8 +11,8 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/httpMethods/build.sc b/example/httpMethods/build.sc index 2816643..699b94f 100644 --- a/example/httpMethods/build.sc +++ b/example/httpMethods/build.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ) @@ -11,8 +11,8 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/minimalApplication/build.sc b/example/minimalApplication/build.sc index 2816643..699b94f 100644 --- a/example/minimalApplication/build.sc +++ b/example/minimalApplication/build.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ) @@ -11,8 +11,8 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/minimalApplication2/build.sc b/example/minimalApplication2/build.sc index 2816643..699b94f 100644 --- a/example/minimalApplication2/build.sc +++ b/example/minimalApplication2/build.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ) @@ -11,8 +11,8 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/redirectAbort/build.sc b/example/redirectAbort/build.sc index 2816643..699b94f 100644 --- a/example/redirectAbort/build.sc +++ b/example/redirectAbort/build.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ) @@ -11,8 +11,8 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/scalatags/build.sc b/example/scalatags/build.sc index 3303601..c89d9cc 100644 --- a/example/scalatags/build.sc +++ b/example/scalatags/build.sc @@ -2,18 +2,18 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", - ivy"com.lihaoyi::scalatags:0.6.7", + ivy"com.lihaoyi::scalatags:0.7.0", ) object test extends Tests{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/staticFiles/build.sc b/example/staticFiles/build.sc index c83a0df..911f989 100644 --- a/example/staticFiles/build.sc +++ b/example/staticFiles/build.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ) @@ -13,8 +13,8 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) def forkWorkingDir = build.millSourcePath diff --git a/example/todo/build.sc b/example/todo/build.sc index 093fb3f..782aaef 100644 --- a/example/todo/build.sc +++ b/example/todo/build.sc @@ -2,20 +2,20 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ivy"org.xerial:sqlite-jdbc:3.18.0", ivy"io.getquill::quill-jdbc:2.5.4", - ivy"com.lihaoyi::scalatags:0.6.7", + ivy"com.lihaoyi::scalatags:0.7.0", ) object test extends Tests{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/todoApi/build.sc b/example/todoApi/build.sc index 2816643..699b94f 100644 --- a/example/todoApi/build.sc +++ b/example/todoApi/build.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ) @@ -11,8 +11,8 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/todoDb/build.sc b/example/todoDb/build.sc index c6f8514..ab1181e 100644 --- a/example/todoDb/build.sc +++ b/example/todoDb/build.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ivy"org.xerial:sqlite-jdbc:3.18.0", @@ -13,8 +13,8 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/twirl/build.sc b/example/twirl/build.sc index 3627133..b8e1746 100644 --- a/example/twirl/build.sc +++ b/example/twirl/build.sc @@ -1,14 +1,14 @@ import mill._, scalalib._ -import $ivy.`com.lihaoyi::mill-contrib-twirllib:0.2.6-27-613878` +import $ivy.`com.lihaoyi::mill-contrib-twirllib:0.4.1-4-158d11` trait AppModule extends ScalaModule with mill.twirllib.TwirlModule{ - def scalaVersion = "2.12.6" - def twirlVersion = "1.3.15" + def scalaVersion = "2.13.0" + def twirlVersion = "1.5.0-M1" def generatedSources = T{ Seq(compileTwirl().classes) } def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", - ivy"com.lihaoyi::scalatags:0.6.7", + ivy"com.lihaoyi::scalatags:0.7.0", ivy"com.typesafe.play::twirl-api:${twirlVersion()}", ) @@ -16,8 +16,8 @@ trait AppModule extends ScalaModule with mill.twirllib.TwirlModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/variableRoutes/app/test/src/ExampleTests.scala b/example/variableRoutes/app/test/src/ExampleTests.scala index 49c960b..48455fa 100644 --- a/example/variableRoutes/app/test/src/ExampleTests.scala +++ b/example/variableRoutes/app/test/src/ExampleTests.scala @@ -27,7 +27,7 @@ object ExampleTests extends TestSuite{ requests.get(s"$host/post/123?param=xyz¶m=abc").text() ==> - "Post 123 ArrayBuffer(xyz, abc)" + "Post 123 ArraySeq(xyz, abc)" requests.get(s"$host/post/123").text() ==> """Missing argument: (param: Seq[String]) diff --git a/example/variableRoutes/build.sc b/example/variableRoutes/build.sc index 2816643..699b94f 100644 --- a/example/variableRoutes/build.sc +++ b/example/variableRoutes/build.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ) @@ -11,8 +11,8 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ) } } \ No newline at end of file diff --git a/example/websockets/build.sc b/example/websockets/build.sc index 3661ee3..31f75f5 100644 --- a/example/websockets/build.sc +++ b/example/websockets/build.sc @@ -2,7 +2,7 @@ import mill._, scalalib._ trait AppModule extends ScalaModule{ - def scalaVersion = "2.12.6" + def scalaVersion = "2.13.0" def ivyDeps = Agg( ivy"com.lihaoyi::cask:0.1.9", ) @@ -11,8 +11,8 @@ trait AppModule extends ScalaModule{ def testFrameworks = Seq("utest.runner.Framework") def ivyDeps = Agg( - ivy"com.lihaoyi::utest::0.6.3", - ivy"com.lihaoyi::requests::0.1.5", + ivy"com.lihaoyi::utest::0.6.9", + ivy"com.lihaoyi::requests::0.2.0", ivy"org.asynchttpclient:async-http-client:2.5.2" ) } -- cgit v1.2.3